Revert "Move AtomicWaker from futures-core to futures-task"

This reverts commit dd664a3.
rust-lang · Nov 5, 2019 · 5325417 · 5325417
1 parent 5cc1f42
commit 5325417
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 15 deletions.
diff --git a/futures-channel/Cargo.toml b/futures-channel/Cargo.toml
@@ -23,12 +23,11 @@ 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", "futures-task-preview/unstable"]
-cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic", "futures-task-preview/cfg-target-has-atomic"]
+unstable = ["futures-core-preview/unstable"]
+cfg-target-has-atomic = ["futures-core-preview/cfg-target-has-atomic"]
 
 [dependencies]
 futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.19", default-features = false }
-futures-task-preview = { path = "../futures-task", version = "=0.3.0-alpha.19", default-features = false }
 futures-sink-preview = { path = "../futures-sink", version = "=0.3.0-alpha.19", default-features = false, optional = true }
 
 [dev-dependencies]

diff --git a/futures-channel/src/mpsc/mod.rs b/futures-channel/src/mpsc/mod.rs
@@ -80,7 +80,7 @@
 
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll, Waker};
-use futures_task::AtomicWaker;
+use futures_core::task::__internal::AtomicWaker;
 use std::fmt;
 use std::pin::Pin;
 use std::sync::{Arc, Mutex};

diff --git a/futures-task/src/atomic_waker.rs → ...-core/src/task/__internal/atomic_waker.rs b/futures-task/src/atomic_waker.rs → ...-core/src/task/__internal/atomic_waker.rs
diff --git a/futures-core/src/task/__internal/mod.rs b/futures-core/src/task/__internal/mod.rs
@@ -0,0 +1,4 @@
+#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+mod atomic_waker;
+#[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+pub use self::atomic_waker::AtomicWaker;
diff --git a/futures-core/src/task/mod.rs b/futures-core/src/task/mod.rs
@@ -0,0 +1,9 @@
+//! Task notification.
+
+#[macro_use]
+mod poll;
+
+#[doc(hidden)]
+pub mod __internal;
+
+pub use core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
diff --git a/futures-core/src/task.rs → futures-core/src/task/poll.rs b/futures-core/src/task.rs → futures-core/src/task/poll.rs
@@ -1,7 +1,3 @@
-//! Task notification.
-
-pub use core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
-
 /// Extracts the successful type of a `Poll<T>`.
 ///
 /// This macro bakes in propagation of `Pending` signals by returning early.

diff --git a/futures-task/src/lib.rs b/futures-task/src/lib.rs
@@ -30,11 +30,6 @@ mod spawn;
 pub use crate::spawn::{Spawn, SpawnError, LocalSpawn};
 
 cfg_target_has_atomic! {
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-    mod atomic_waker;
-    #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
-    pub use crate::atomic_waker::AtomicWaker;
-
     #[cfg(feature = "alloc")]
     mod arc_wake;
     #[cfg(feature = "alloc")]

diff --git a/futures-util/src/stream/futures_unordered/mod.rs b/futures-util/src/stream/futures_unordered/mod.rs
@@ -6,7 +6,8 @@
 use futures_core::future::Future;
 use futures_core::stream::{FusedStream, Stream};
 use futures_core::task::{Context, Poll};
-use futures_task::{FutureObj, LocalFutureObj, AtomicWaker, Spawn, LocalSpawn, SpawnError};
+use futures_task::{FutureObj, LocalFutureObj, Spawn, LocalSpawn, SpawnError};
+use crate::task::AtomicWaker;
 use core::cell::UnsafeCell;
 use core::fmt::{self, Debug};
 use core::iter::FromIterator;

diff --git a/futures-util/src/task/mod.rs b/futures-util/src/task/mod.rs
@@ -10,7 +10,7 @@ cfg_target_has_atomic! {
     #[cfg(feature = "alloc")]
     pub use futures_task::{waker_ref, WakerRef};
 
-    pub use futures_task::AtomicWaker;
+    pub use futures_core::task::__internal::AtomicWaker;
 }
 
 mod spawn;