refactor(gstd): use waker-fn instead of unsafe code

gear-tech · Oct 1, 2024 · 4c647b5 · 4c647b5
1 parent 5d67331
commit 4c647b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gstd/Cargo.toml b/gstd/Cargo.toml
@@ -25,6 +25,7 @@ hex = { workspace = true, features = ["alloc"] }
 parity-scale-codec = { workspace = true, features = ["derive"] }
 scale-info = { workspace = true, features = ["derive"] }
 futures = { workspace = true, features = ["alloc"] }
+waker-fn = "1.1.1"
 
 [features]
 #! ## Default features

diff --git a/gstd/src/async_runtime/waker.rs b/gstd/src/async_runtime/waker.rs
@@ -18,20 +18,8 @@
 
 //! Module for Gear programs asynchronous waker.
 
-use core::{
-    ptr,
-    task::{RawWaker, RawWakerVTable, Waker},
-};
-
-const VTABLE: RawWakerVTable = RawWakerVTable::new(clone_waker, wake, wake_by_ref, drop_waker);
+use core::task::Waker;
 
 pub(crate) fn empty() -> Waker {
-    unsafe { Waker::from_raw(RawWaker::new(ptr::null(), &VTABLE)) }
-}
-
-unsafe fn clone_waker(ptr: *const ()) -> RawWaker {
-    RawWaker::new(ptr, &VTABLE)
+    waker_fn::waker_fn(|| {})
 }
-unsafe fn wake(_ptr: *const ()) {}
-unsafe fn wake_by_ref(_ptr: *const ()) {}
-unsafe fn drop_waker(_ptr: *const ()) {}