[unstable-rust] Use feature(noop_waker) instead of futures's waker.

kpreid · Sep 6, 2024 · 65ac349 · 65ac349
1 parent 7b75710
commit 65ac349
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/all-is-cubes-gpu/src/in_wgpu/shaders.rs b/all-is-cubes-gpu/src/in_wgpu/shaders.rs
@@ -6,7 +6,6 @@ use std::sync::LazyLock as Lazy;
 use std::task;
 
 use futures_core::future::BoxFuture;
-use futures_util::task::noop_waker_ref;
 
 use all_is_cubes::listen;
 
@@ -163,7 +162,7 @@ impl ReloadableShader {
         if let Some(f) = self.next_module.as_mut() {
             if let task::Poll::Ready(result) = f
                 .as_mut()
-                .poll(&mut task::Context::from_waker(noop_waker_ref()))
+                .poll(&mut task::Context::from_waker(task::Waker::noop()))
             {
                 self.next_module = None;
                 match result {

diff --git a/all-is-cubes-gpu/src/lib.rs b/all-is-cubes-gpu/src/lib.rs
@@ -1,4 +1,5 @@
 #![feature(never_type)]
+#![feature(noop_waker)]
 
 //! Algorithms for rendering [All is Cubes] content using a GPU, via
 //! the [`wgpu`] graphics library.

diff --git a/all-is-cubes-ui/src/apps/session.rs b/all-is-cubes-ui/src/apps/session.rs
@@ -5,12 +5,11 @@ use core::marker::PhantomData;
 use core::mem;
 use core::pin::Pin;
 use core::sync::atomic::{AtomicBool, Ordering};
-use core::task::{Context, Poll};
+use core::task::{Context, Poll, Waker};
 use std::sync::RwLock;
 
 use flume::TryRecvError;
 use futures_core::future::BoxFuture;
-use futures_task::noop_waker_ref;
 use sync_wrapper::SyncWrapper;
 
 use all_is_cubes::arcstr::{self, ArcStr};
@@ -420,7 +419,7 @@ impl<I: time::Instant> Session<I> {
 
             let future: Pin<&mut dyn Future<Output = ExitMainTask>> =
                 sync_wrapped_future.get_mut().as_mut();
-            match future.poll(&mut Context::from_waker(noop_waker_ref())) {
+            match future.poll(&mut Context::from_waker(Waker::noop())) {
                 Poll::Pending => {}
                 Poll::Ready(ExitMainTask) => {
                     self.main_task = None;

diff --git a/all-is-cubes-ui/src/lib.rs b/all-is-cubes-ui/src/lib.rs
@@ -1,6 +1,6 @@
 #![feature(never_type)]
+#![feature(noop_waker)]
 
->>>>>>> 42f7f7b0 ([unstable-rust] Use `!` type for non-errors.)
 //! User interface framework and screens for [`all_is_cubes`].
 //!
 //! This crate does not provide any platform bindings, but contains components for