Merge pull request #55 from sunfishcode/sunfishcode/unsafe

Reinstate `#![forbid(unsafe_code)]`.

Author: sunfishcode

README.md

@@ -81,7 +81,7 @@ $ cargo add wstd
 ```
 
 ## Safety
-This crate uses ``#![deny(unsafe_code)]`` to ensure everything is implemented in
+This crate uses ``#![forbid(unsafe_code)]`` to ensure everything is implemented in
 100% Safe Rust.
 
 ## Contributing

src/lib.rs

@@ -1,5 +1,6 @@
 #![allow(async_fn_in_trait)]
 #![warn(future_incompatible, unreachable_pub)]
+#![forbid(unsafe_code)]
 //#![deny(missing_debug_implementations)]
 //#![warn(missing_docs)]
 //#![forbid(rustdoc::missing_doc_code_examples)]

src/runtime/block_on.rs

@@ -2,9 +2,10 @@ use super::{Reactor, REACTOR};
 
 use core::future::Future;
 use core::pin::pin;
-use core::ptr;
 use core::task::Waker;
-use core::task::{Context, Poll, RawWaker, RawWakerVTable};
+use core::task::{Context, Poll};
+use std::sync::Arc;
+use std::task::Wake;
 
 /// Start the event loop
 pub fn block_on<Fut>(fut: Fut) -> Fut::Output
@@ -42,18 +43,11 @@ where
 /// Construct a new no-op waker
 // NOTE: we can remove this once <https://github.com/rust-lang/rust/issues/98286> lands
 fn noop_waker() -> Waker {
-    const VTABLE: RawWakerVTable = RawWakerVTable::new(
-        // Cloning just returns a new no-op raw waker
-        |_| RAW,
-        // `wake` does nothing
-        |_| {},
-        // `wake_by_ref` does nothing
-        |_| {},
-        // Dropping does nothing as we don't allocate anything
-        |_| {},
-    );
-    const RAW: RawWaker = RawWaker::new(ptr::null(), &VTABLE);
-
-    // SAFETY: all fields are no-ops, so this is safe
-    unsafe { Waker::from_raw(RAW) }
+    struct NoopWaker;
+
+    impl Wake for NoopWaker {
+        fn wake(self: Arc<Self>) {}
+    }
+
+    Waker::from(Arc::new(NoopWaker))
 }