Skip to content

Commit 92d2c70

Browse files
committed
Fix no_std build
1 parent 131c13f commit 92d2c70

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

futures-util/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! Combinators and utilities for working with `Future`s, `Stream`s, `Sink`s,
22
//! and the `AsyncRead` and `AsyncWrite` traits.
33
4-
#![feature(futures_api, box_into_pin)]
5-
#![cfg_attr(feature = "std", feature(async_await, await_macro))]
4+
#![feature(futures_api)]
5+
#![cfg_attr(feature = "std", feature(async_await, await_macro, box_into_pin))]
66
#![cfg_attr(feature = "cfg-target-has-atomic", feature(cfg_target_has_atomic))]
77

88
#![cfg_attr(not(feature = "std"), no_std)]

futures-util/src/task/mod.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ mod arc_wake;
66
pub use self::arc_wake::ArcWake;
77

88
mod noop_waker;
9-
pub use self::noop_waker::{noop_waker, noop_waker_ref};
9+
pub use self::noop_waker::noop_waker;
10+
#[cfg(feature = "std")]
11+
pub use self::noop_waker::noop_waker_ref;
1012

1113
mod spawn;
1214
pub use self::spawn::{SpawnExt, LocalSpawnExt};

futures-util/src/task/noop_waker.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! Utilities for creating zero-cost wakers that don't do anything.
22
use futures_core::task::{RawWaker, RawWakerVTable, Waker};
33
use core::ptr::null;
4+
#[cfg(feature = "std")]
45
use core::cell::UnsafeCell;
56

67
unsafe fn noop_clone(_data: *const()) -> RawWaker {
@@ -52,6 +53,7 @@ pub fn noop_waker() -> Waker {
5253
/// lw.wake();
5354
/// ```
5455
#[inline]
56+
#[cfg(feature = "std")]
5557
pub fn noop_waker_ref() -> &'static Waker {
5658
thread_local! {
5759
static NOOP_WAKER_INSTANCE: UnsafeCell<Waker> =

futures/src/lib.rs

+8-5
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,10 @@ pub mod future {
207207
AndThen, ErrInto, FlattenSink, IntoFuture, MapErr, MapOk, OrElse,
208208
UnwrapOrElse,
209209
TryJoin, TryJoin3, TryJoin4, TryJoin5,
210+
};
211+
212+
#[cfg(feature = "std")]
213+
pub use futures_util::try_future::{
210214
try_join_all, TryJoinAll,
211215
};
212216
}
@@ -364,18 +368,17 @@ pub mod task {
364368
Waker, RawWaker, RawWakerVTable
365369
};
366370

371+
pub use futures_util::task::noop_waker;
372+
367373
#[cfg(feature = "std")]
368374
pub use futures_util::task::{
369375
WakerRef, waker_ref, ArcWake,
370376
SpawnExt, LocalSpawnExt,
371-
};
372-
373-
pub use futures_util::task::{
374-
noop_waker, noop_waker_ref,
377+
noop_waker_ref,
375378
};
376379

377380
#[cfg_attr(
378-
feature = "target-has-atomic",
381+
feature = "cfg-target-has-atomic",
379382
cfg(all(target_has_atomic = "cas", target_has_atomic = "ptr"))
380383
)]
381384
pub use futures_util::task::AtomicWaker;

0 commit comments

Comments
 (0)