From 67cf1f856bf50fae7ee519cfdbc8f5b6ff8d6706 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Thu, 11 Dec 2025 17:36:54 +0100 Subject: Update Rust, nightly, xtensa. --- .github/ci/build-xtensa.sh | 2 +- rust-toolchain-nightly.toml | 2 +- rust-toolchain.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ci/build-xtensa.sh b/.github/ci/build-xtensa.sh index f07816861..cc56adb26 100755 --- a/.github/ci/build-xtensa.sh +++ b/.github/ci/build-xtensa.sh @@ -14,7 +14,7 @@ export PATH=$CARGO_HOME/bin:$PATH export CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install espup --locked -espup install --toolchain-version 1.88.0.0 +espup install --toolchain-version 1.90.0.0 # Restore lockfiles if [ -f /ci/cache/lockfiles.tar ]; then diff --git a/rust-toolchain-nightly.toml b/rust-toolchain-nightly.toml index dde431bba..2a46473b7 100644 --- a/rust-toolchain-nightly.toml +++ b/rust-toolchain-nightly.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2025-09-26" +channel = "nightly-2025-12-11" components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ] targets = [ "thumbv7em-none-eabi", diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5d925c934..1f47bee1e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.90" +channel = "1.92" components = [ "rust-src", "rustfmt", "llvm-tools" ] targets = [ "thumbv7em-none-eabi", -- cgit From 7083411ca255efdfe0ebf9cfba8e889c38630aee Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Fri, 12 Dec 2025 00:42:31 +0100 Subject: examples/std: fix warning. --- examples/std/src/bin/net_ppp.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/std/src/bin/net_ppp.rs b/examples/std/src/bin/net_ppp.rs index 82272c798..685dbf3d3 100644 --- a/examples/std/src/bin/net_ppp.rs +++ b/examples/std/src/bin/net_ppp.rs @@ -52,7 +52,7 @@ async fn ppp_task(stack: Stack<'static>, mut runner: Runner<'static>, port: Seri password: b"mypass", }; - runner + let r = runner .run(port, config, |ipv4| { let Some(addr) = ipv4.address else { warn!("PPP did not provide an IP address."); @@ -69,9 +69,10 @@ async fn ppp_task(stack: Stack<'static>, mut runner: Runner<'static>, port: Seri }); stack.set_config_v4(config); }) - .await - .unwrap(); - unreachable!() + .await; + match r { + Err(e) => panic!("{:?}", e), + } } #[embassy_executor::task] -- cgit From d7c7a5e76602e495d65da49f0f8eea80e3cc3fc2 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Fri, 12 Dec 2025 00:48:16 +0100 Subject: executor: update ui test for nightly. --- .../tests/ui/bad_return_impl_future_nightly.stderr | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/embassy-executor/tests/ui/bad_return_impl_future_nightly.stderr b/embassy-executor/tests/ui/bad_return_impl_future_nightly.stderr index 3c3c9503b..e5e069ade 100644 --- a/embassy-executor/tests/ui/bad_return_impl_future_nightly.stderr +++ b/embassy-executor/tests/ui/bad_return_impl_future_nightly.stderr @@ -5,6 +5,10 @@ error[E0277]: task futures must resolve to `()` or `!` | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TaskReturnValue` is not implemented for `u32` | = note: use `async fn` or change the return type to `impl Future` - = help: the following other types implement trait `TaskReturnValue`: - () - ! as HasOutput>::Output +help: the following other types implement trait `TaskReturnValue` + --> src/lib.rs + | + | impl TaskReturnValue for () {} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `()` + | impl TaskReturnValue for Never {} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ` ! as HasOutput>::Output` -- cgit