Skip to content

Commit 06c7bf7

Browse files
committed
[unstable-rust] Use feature(noop_waker) instead of futures's waker.
1 parent 3f0d364 commit 06c7bf7

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

all-is-cubes-gpu/src/in_wgpu/shaders.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use std::sync::LazyLock as Lazy;
66
use std::task;
77

88
use futures_core::future::BoxFuture;
9-
use futures_util::task::noop_waker_ref;
109

1110
use all_is_cubes::listen;
1211

@@ -163,7 +162,7 @@ impl ReloadableShader {
163162
if let Some(f) = self.next_module.as_mut() {
164163
if let task::Poll::Ready(result) = f
165164
.as_mut()
166-
.poll(&mut task::Context::from_waker(noop_waker_ref()))
165+
.poll(&mut task::Context::from_waker(task::Waker::noop()))
167166
{
168167
self.next_module = None;
169168
match result {

all-is-cubes-gpu/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![feature(never_type)]
2+
#![feature(noop_waker)]
23

34
//! Algorithms for rendering [All is Cubes] content using a GPU, via
45
//! the [`wgpu`] graphics library.

all-is-cubes-ui/src/apps/session.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ use core::marker::PhantomData;
1212
use core::mem;
1313
use core::pin::Pin;
1414
use core::sync::atomic::{AtomicBool, Ordering};
15-
use core::task::{Context, Poll};
15+
use core::task::{Context, Poll, Waker};
1616
use std::sync::RwLock;
1717

1818
use flume::TryRecvError;
1919
use futures_core::future::BoxFuture;
20-
use futures_task::noop_waker_ref;
2120
use sync_wrapper::SyncWrapper;
2221

2322
use all_is_cubes::arcstr::{self, ArcStr};
@@ -427,7 +426,7 @@ impl<I: time::Instant> Session<I> {
427426

428427
let future: Pin<&mut dyn Future<Output = ExitMainTask>> =
429428
sync_wrapped_future.get_mut().as_mut();
430-
match future.poll(&mut Context::from_waker(noop_waker_ref())) {
429+
match future.poll(&mut Context::from_waker(Waker::noop())) {
431430
Poll::Pending => {}
432431
Poll::Ready(ExitMainTask) => {
433432
self.main_task = None;

all-is-cubes-ui/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![feature(never_type)]
2+
#![feature(noop_waker)]
23

34
//! User interface framework and screens for [`all_is_cubes`].
45
//!

0 commit comments

Comments
 (0)