Merge pull request #3316 from Ddystopia/main

fix: nightly api changed during the night
embassy-rs · Sep 6, 2024 · 1cf7789 · 1cf7789
2 parents ca3d091 + 1443f33
commit 1cf7789
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/embassy-executor/src/lib.rs b/embassy-executor/src/lib.rs
@@ -1,5 +1,4 @@
 #![cfg_attr(not(any(feature = "arch-std", feature = "arch-wasm")), no_std)]
-#![cfg_attr(feature = "nightly", feature(waker_getters))]
 #![allow(clippy::new_without_default)]
 #![doc = include_str!("../README.md")]
 #![warn(missing_docs)]

diff --git 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 {
 
         #[cfg(feature = "nightly")]
         {
-            let raw_waker = waker.as_raw();
-            (raw_waker.vtable(), raw_waker.data())
+            (waker.vtable(), waker.data())
         }
     };
 

diff --git a/rust-toolchain-nightly.toml b/rust-toolchain-nightly.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-07-16"
+channel = "nightly-2024-09-06"
 components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ]
 targets = [
     "thumbv7em-none-eabi",