aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-06-18 01:44:02 +0200
committerGitHub <[email protected]>2022-06-18 01:44:02 +0200
commitb585d547124b9a1e70b0933c11228c065684997d (patch)
tree718b4496152453482db49334ee83626289a4133d
parentfcc1db078e8ea131171493038015974d3a76d99a (diff)
Update rust nightly. (#819)
-rw-r--r--embassy-nrf/src/uarte.rs6
-rw-r--r--examples/nrf/src/bin/pwm_sequence_ppi.rs1
-rw-r--r--rust-toolchain.toml11
3 files changed, 12 insertions, 6 deletions
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs
index 50b341447..c129fb63a 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> {
477} 477}
478 478
479#[cfg(not(any(feature = "_nrf9160", feature = "nrf5340")))] 479#[cfg(not(any(feature = "_nrf9160", feature = "nrf5340")))]
480pub(in crate) fn apply_workaround_for_enable_anomaly(_r: &crate::pac::uarte0::RegisterBlock) { 480pub(crate) fn apply_workaround_for_enable_anomaly(_r: &crate::pac::uarte0::RegisterBlock) {
481 // Do nothing 481 // Do nothing
482} 482}
483 483
484#[cfg(any(feature = "_nrf9160", feature = "nrf5340"))] 484#[cfg(any(feature = "_nrf9160", feature = "nrf5340"))]
485pub(in crate) fn apply_workaround_for_enable_anomaly(r: &crate::pac::uarte0::RegisterBlock) { 485pub(crate) fn apply_workaround_for_enable_anomaly(r: &crate::pac::uarte0::RegisterBlock) {
486 use core::ops::Deref; 486 use core::ops::Deref;
487 487
488 // Apply workaround for anomalies: 488 // Apply workaround for anomalies:
@@ -529,7 +529,7 @@ pub(in crate) fn apply_workaround_for_enable_anomaly(r: &crate::pac::uarte0::Reg
529 } 529 }
530} 530}
531 531
532pub(in crate) fn drop_tx_rx(r: &pac::uarte0::RegisterBlock, s: &sealed::State) { 532pub(crate) fn drop_tx_rx(r: &pac::uarte0::RegisterBlock, s: &sealed::State) {
533 if s.tx_rx_refcount.fetch_sub(1, Ordering::Relaxed) == 1 { 533 if s.tx_rx_refcount.fetch_sub(1, Ordering::Relaxed) == 1 {
534 // Finally we can disable, and we do so for the peripheral 534 // Finally we can disable, and we do so for the peripheral
535 // i.e. not just rx concerns. 535 // 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 7d020e48d..d98e2ca76 100644
--- a/examples/nrf/src/bin/pwm_sequence_ppi.rs
+++ b/examples/nrf/src/bin/pwm_sequence_ppi.rs
@@ -1,7 +1,6 @@
1#![no_std] 1#![no_std]
2#![no_main] 2#![no_main]
3#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
4#![feature(array_from_fn)]
5 4
6use core::future::pending; 5use core::future::pending;
7 6
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e73ef7e90..03fe8a009 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,6 +1,13 @@
1# Before upgrading check that everything is available on all tier1 targets here: 1# Before upgrading check that everything is available on all tier1 targets here:
2# https://rust-lang.github.io/rustup-components-history 2# https://rust-lang.github.io/rustup-components-history
3[toolchain] 3[toolchain]
4channel = "nightly-2022-04-24" 4channel = "nightly-2022-06-17"
5components = [ "rust-src", "rustfmt" ] 5components = [ "rust-src", "rustfmt" ]
6targets = [ "thumbv7em-none-eabi", "thumbv7m-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf", "wasm32-unknown-unknown" ] 6targets = [
7 "thumbv7em-none-eabi",
8 "thumbv7m-none-eabi",
9 "thumbv6m-none-eabi",
10 "thumbv7em-none-eabihf",
11 "thumbv8m.main-none-eabihf",
12 "wasm32-unknown-unknown",
13]