diff options
| author | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2022-06-18 01:44:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-18 01:44:02 +0200 |
| commit | b585d547124b9a1e70b0933c11228c065684997d (patch) | |
| tree | 718b4496152453482db49334ee83626289a4133d | |
| parent | fcc1db078e8ea131171493038015974d3a76d99a (diff) | |
| download | embassy-b585d547124b9a1e70b0933c11228c065684997d.zip | |
Update rust nightly. (#819)
| -rw-r--r-- | embassy-nrf/src/uarte.rs | 6 | ||||
| -rw-r--r-- | examples/nrf/src/bin/pwm_sequence_ppi.rs | 1 | ||||
| -rw-r--r-- | rust-toolchain.toml | 11 |
3 files changed, 12 insertions, 6 deletions
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index 50b34144..c129fb63 100644 --- a/embassy-nrf/src/uarte.rs +++ b/embassy-nrf/src/uarte.rs @@ -477,12 +477,12 @@ impl<'a, T: Instance> Drop for UarteRx<'a, T> { } #[cfg(not(any(feature = "_nrf9160", feature = "nrf5340")))] -pub(in crate) fn apply_workaround_for_enable_anomaly(_r: &crate::pac::uarte0::RegisterBlock) { +pub(crate) fn apply_workaround_for_enable_anomaly(_r: &crate::pac::uarte0::RegisterBlock) { // Do nothing } #[cfg(any(feature = "_nrf9160", feature = "nrf5340"))] -pub(in crate) fn apply_workaround_for_enable_anomaly(r: &crate::pac::uarte0::RegisterBlock) { +pub(crate) fn apply_workaround_for_enable_anomaly(r: &crate::pac::uarte0::RegisterBlock) { use core::ops::Deref; // Apply workaround for anomalies: @@ -529,7 +529,7 @@ pub(in crate) fn apply_workaround_for_enable_anomaly(r: &crate::pac::uarte0::Reg } } -pub(in crate) fn drop_tx_rx(r: &pac::uarte0::RegisterBlock, s: &sealed::State) { +pub(crate) fn drop_tx_rx(r: &pac::uarte0::RegisterBlock, s: &sealed::State) { if s.tx_rx_refcount.fetch_sub(1, Ordering::Relaxed) == 1 { // Finally we can disable, and we do so for the peripheral // i.e. not just rx concerns. diff --git a/examples/nrf/src/bin/pwm_sequence_ppi.rs b/examples/nrf/src/bin/pwm_sequence_ppi.rs index 7d020e48..d98e2ca7 100644 --- a/examples/nrf/src/bin/pwm_sequence_ppi.rs +++ b/examples/nrf/src/bin/pwm_sequence_ppi.rs @@ -1,7 +1,6 @@ #![no_std] #![no_main] #![feature(type_alias_impl_trait)] -#![feature(array_from_fn)] use core::future::pending; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e73ef7e9..03fe8a00 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,13 @@ # Before upgrading check that everything is available on all tier1 targets here: # https://rust-lang.github.io/rustup-components-history [toolchain] -channel = "nightly-2022-04-24" +channel = "nightly-2022-06-17" components = [ "rust-src", "rustfmt" ] -targets = [ "thumbv7em-none-eabi", "thumbv7m-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf", "wasm32-unknown-unknown" ] +targets = [ + "thumbv7em-none-eabi", + "thumbv7m-none-eabi", + "thumbv6m-none-eabi", + "thumbv7em-none-eabihf", + "thumbv8m.main-none-eabihf", + "wasm32-unknown-unknown", +] |