aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--embassy-net-esp-hosted/src/control.rs6
-rw-r--r--rust-toolchain.toml2
-rw-r--r--tests/stm32/src/bin/can.rs4
3 files changed, 6 insertions, 6 deletions
diff --git a/embassy-net-esp-hosted/src/control.rs b/embassy-net-esp-hosted/src/control.rs
index 6cd57f68a..b8026611b 100644
--- a/embassy-net-esp-hosted/src/control.rs
+++ b/embassy-net-esp-hosted/src/control.rs
@@ -35,9 +35,9 @@ macro_rules! ioctl {
35 }; 35 };
36 $self.ioctl(&mut msg).await?; 36 $self.ioctl(&mut msg).await?;
37 let Some(proto::CtrlMsgPayload::$resp_variant($resp)) = msg.payload else { 37 let Some(proto::CtrlMsgPayload::$resp_variant($resp)) = msg.payload else {
38 warn!("unexpected response variant"); 38 warn!("unexpected response variant");
39 return Err(Error::Internal); 39 return Err(Error::Internal);
40 }; 40 };
41 if $resp.resp != 0 { 41 if $resp.resp != 0 {
42 return Err(Error::Failed($resp.resp)); 42 return Err(Error::Failed($resp.resp));
43 } 43 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 179ed1d6a..7b34afa2b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,7 +1,7 @@
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-2023-06-28" 4channel = "nightly-2023-08-19"
5components = [ "rust-src", "rustfmt", "llvm-tools-preview" ] 5components = [ "rust-src", "rustfmt", "llvm-tools-preview" ]
6targets = [ 6targets = [
7 "thumbv7em-none-eabi", 7 "thumbv7em-none-eabi",
diff --git a/tests/stm32/src/bin/can.rs b/tests/stm32/src/bin/can.rs
index 8737ca8ee..acf545216 100644
--- a/tests/stm32/src/bin/can.rs
+++ b/tests/stm32/src/bin/can.rs
@@ -80,8 +80,8 @@ async fn main(_spawner: Spawner) {
80 const MIN_LATENCY: Duration = Duration::from_micros(50); 80 const MIN_LATENCY: Duration = Duration::from_micros(50);
81 const MAX_LATENCY: Duration = Duration::from_micros(150); 81 const MAX_LATENCY: Duration = Duration::from_micros(150);
82 assert!( 82 assert!(
83 MIN_LATENCY < latency && latency < MAX_LATENCY, 83 MIN_LATENCY <= latency && latency <= MAX_LATENCY,
84 "{} < {} < {}", 84 "{} <= {} <= {}",
85 MIN_LATENCY, 85 MIN_LATENCY,
86 latency, 86 latency,
87 MAX_LATENCY 87 MAX_LATENCY