Fix no-std build

rust-lang · Nov 1, 2019 · 394b62b · 394b62b
1 parent 40342fe
commit 394b62b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/futures-channel/Cargo.toml b/futures-channel/Cargo.toml
@@ -23,8 +23,8 @@ sink = ["futures-sink-preview"]
 # Unstable features
 # These features are outside of the normal semver guarantees and require the
 # `unstable` feature as an explicit opt-in to unstable API.
-unstable = ["futures-core-preview/unstable"]
-cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic"]
+unstable = ["futures-core-preview/unstable", "futures-task-preview/unstable"]
+cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-task-preview/cfg-target-has-atomic"]
 
 [dependencies]
 futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.19", default-features = false }

diff --git a/futures-task/Cargo.toml b/futures-task/Cargo.toml
@@ -26,4 +26,3 @@ unstable = []
 cfg-target-has-atomic = []
 
 [dependencies]
-futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.19" }
diff --git a/futures-task/src/lib.rs b/futures-task/src/lib.rs
@@ -59,4 +59,4 @@ pub use crate::noop_waker::noop_waker;
 #[cfg(feature = "std")]
 pub use crate::noop_waker::noop_waker_ref;
 
-pub use futures_core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
+pub use core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
diff --git a/futures-task/src/noop_waker.rs b/futures-task/src/noop_waker.rs
@@ -1,6 +1,6 @@
 //! Utilities for creating zero-cost wakers that don't do anything.
 
-use futures_core::task::{RawWaker, RawWakerVTable, Waker};
+use core::task::{RawWaker, RawWakerVTable, Waker};
 use core::ptr::null;
 #[cfg(feature = "std")]
 use core::cell::UnsafeCell;

diff --git a/futures-util/Cargo.toml b/futures-util/Cargo.toml
@@ -29,8 +29,8 @@ channel = ["std", "futures-channel-preview"]
 # Unstable features
 # These features are outside of the normal semver guarantees and require the
 # `unstable` feature as an explicit opt-in to unstable API.
-unstable = ["futures-core-preview/unstable"]
-cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic"]
+unstable = ["futures-core-preview/unstable", "futures-task-preview/unstable"]
+cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-task-preview/cfg-target-has-atomic"]
 bilock = []
 read_initializer = ["io", "futures-io-preview/read_initializer", "futures-io-preview/unstable"]
 

diff --git a/futures/Cargo.toml b/futures/Cargo.toml
@@ -48,8 +48,8 @@ threadpool = ["futures-executor-preview/threadpool"]
 # Unstable features
 # These features are outside of the normal semver guarantees and require the
 # `unstable` feature as an explicit opt-in to unstable API.
-unstable = ["futures-core-preview/unstable", "futures-channel-preview/unstable", "futures-io-preview/unstable", "futures-util-preview/unstable"]
-cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-channel-preview/cfg-target-has-atomic", "futures-util-preview/cfg-target-has-atomic"]
+unstable = ["futures-core-preview/unstable", "futures-task-preview/unstable", "futures-channel-preview/unstable", "futures-io-preview/unstable", "futures-util-preview/unstable"]
+cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-task-preview/cfg-target-has-atomic", "futures-channel-preview/cfg-target-has-atomic", "futures-util-preview/cfg-target-has-atomic"]
 bilock = ["futures-util-preview/bilock"]
 read_initializer = ["futures-io-preview/read_initializer", "futures-util-preview/read_initializer"]