Skip to content

Commit c4a1a00

Browse files
committed
[unstable-rust] Use feature(noop_waker) instead of futures's waker.
1 parent 88798d7 commit c4a1a00

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
33
use std::borrow::Cow;
44
use std::sync::Arc;
5-
use std::task;
65
use std::sync::LazyLock as Lazy;
6+
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

@@ -161,7 +160,7 @@ impl ReloadableShader {
161160
if let Some(f) = self.next_module.as_mut() {
162161
if let task::Poll::Ready(result) = f
163162
.as_mut()
164-
.poll(&mut task::Context::from_waker(noop_waker_ref()))
163+
.poll(&mut task::Context::from_waker(task::Waker::noop()))
165164
{
166165
self.next_module = None;
167166
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
@@ -5,12 +5,11 @@ use core::marker::PhantomData;
55
use core::mem;
66
use core::pin::Pin;
77
use core::sync::atomic::{AtomicBool, Ordering};
8-
use core::task::{Context, Poll};
8+
use core::task::{Context, Poll, Waker};
99
use std::sync::RwLock;
1010

1111
use flume::TryRecvError;
1212
use futures_core::future::BoxFuture;
13-
use futures_task::noop_waker_ref;
1413
use sync_wrapper::SyncWrapper;
1514

1615
use all_is_cubes::arcstr::{self, ArcStr};
@@ -420,7 +419,7 @@ impl<I: time::Instant> Session<I> {
420419

421420
let future: Pin<&mut dyn Future<Output = ExitMainTask>> =
422421
sync_wrapped_future.get_mut().as_mut();
423-
match future.poll(&mut Context::from_waker(noop_waker_ref())) {
422+
match future.poll(&mut Context::from_waker(Waker::noop())) {
424423
Poll::Pending => {}
425424
Poll::Ready(ExitMainTask) => {
426425
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
#![feature(precise_capturing)]
34

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

0 commit comments

Comments
 (0)