diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-09-06 12:54:17 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-09-06 12:54:17 +0000 |
| commit | 1cf778904d597a5bc01a4b7862f965681636faf1 (patch) | |
| tree | 2bfb428c0540af04bdb8130a064feb554b7dcff3 | |
| parent | ca3d091faf3ef76ea45f88eea5c2a6700378daff (diff) | |
| parent | 1443f3386b3b216dc50306d14f5dacce29b2bf97 (diff) | |
Merge pull request #3316 from Ddystopia/main
fix: nightly api changed during the night
| -rw-r--r-- | embassy-executor/src/lib.rs | 1 | ||||
| -rw-r--r-- | embassy-executor/src/raw/waker.rs | 3 | ||||
| -rw-r--r-- | rust-toolchain-nightly.toml | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/embassy-executor/src/lib.rs b/embassy-executor/src/lib.rs index 553ed76d3..6a2e493a2 100644 --- a/embassy-executor/src/lib.rs +++ b/embassy-executor/src/lib.rs | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #![cfg_attr(not(any(feature = "arch-std", feature = "arch-wasm")), no_std)] | 1 | #![cfg_attr(not(any(feature = "arch-std", feature = "arch-wasm")), no_std)] |
| 2 | #![cfg_attr(feature = "nightly", feature(waker_getters))] | ||
| 3 | #![allow(clippy::new_without_default)] | 2 | #![allow(clippy::new_without_default)] |
| 4 | #![doc = include_str!("../README.md")] | 3 | #![doc = include_str!("../README.md")] |
| 5 | #![warn(missing_docs)] | 4 | #![warn(missing_docs)] |
diff --git a/embassy-executor/src/raw/waker.rs b/embassy-executor/src/raw/waker.rs index 8d3910a25..8bb2cfd05 100644 --- a/embassy-executor/src/raw/waker.rs +++ b/embassy-executor/src/raw/waker.rs | |||
| @@ -50,8 +50,7 @@ pub fn task_from_waker(waker: &Waker) -> TaskRef { | |||
| 50 | 50 | ||
| 51 | #[cfg(feature = "nightly")] | 51 | #[cfg(feature = "nightly")] |
| 52 | { | 52 | { |
| 53 | let raw_waker = waker.as_raw(); | 53 | (waker.vtable(), waker.data()) |
| 54 | (raw_waker.vtable(), raw_waker.data()) | ||
| 55 | } | 54 | } |
| 56 | }; | 55 | }; |
| 57 | 56 | ||
diff --git a/rust-toolchain-nightly.toml b/rust-toolchain-nightly.toml index dfa231344..0b10d7194 100644 --- a/rust-toolchain-nightly.toml +++ b/rust-toolchain-nightly.toml | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | [toolchain] | 1 | [toolchain] |
| 2 | channel = "nightly-2024-07-16" | 2 | channel = "nightly-2024-09-06" |
| 3 | components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ] | 3 | components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ] |
| 4 | targets = [ | 4 | targets = [ |
| 5 | "thumbv7em-none-eabi", | 5 | "thumbv7em-none-eabi", |
