nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-22 14:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1805 from embassy-rs/update-nightly-6

Browse Source 
Update Nightly.
This commit is contained in:
Dario Nieuwenhuis 2023-08-20 09:05:14 +00:00 committed by GitHub
commit 2687008242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embassy-net-esp-hosted/src/control.rs
View File

@ -35,9 +35,9 @@ macro_rules! ioctl {
}; };
$self.ioctl(&mut msg).await?; $self.ioctl(&mut msg).await?;
let Some(proto::CtrlMsgPayload::$resp_variant($resp)) = msg.payload else { let Some(proto::CtrlMsgPayload::$resp_variant($resp)) = msg.payload else {
warn!("unexpected response variant"); warn!("unexpected response variant");
return Err(Error::Internal); return Err(Error::Internal);
}; };
if $resp.resp != 0 { if $resp.resp != 0 {
return Err(Error::Failed($resp.resp)); return Err(Error::Failed($resp.resp));
} }

2
rust-toolchain.toml
View File

@ -1,7 +1,7 @@
# Before upgrading check that everything is available on all tier1 targets here: # Before upgrading check that everything is available on all tier1 targets here:
# https://rust-lang.github.io/rustup-components-history # https://rust-lang.github.io/rustup-components-history
[toolchain] [toolchain]
channel = "nightly-2023-06-28" channel = "nightly-2023-08-19"
components = [ "rust-src", "rustfmt", "llvm-tools-preview" ] components = [ "rust-src", "rustfmt", "llvm-tools-preview" ]
targets = [ targets = [
"thumbv7em-none-eabi", "thumbv7em-none-eabi",

4
tests/stm32/src/bin/can.rs
View File

@ -80,8 +80,8 @@ async fn main(_spawner: Spawner) {
const MIN_LATENCY: Duration = Duration::from_micros(50); const MIN_LATENCY: Duration = Duration::from_micros(50);
const MAX_LATENCY: Duration = Duration::from_micros(150); const MAX_LATENCY: Duration = Duration::from_micros(150);
assert!( assert!(
MIN_LATENCY < latency && latency < MAX_LATENCY, MIN_LATENCY <= latency && latency <= MAX_LATENCY,
"{} < {} < {}", "{} <= {} <= {}",
MIN_LATENCY, MIN_LATENCY,
latency, latency,
MAX_LATENCY MAX_LATENCY