Move other task utils from futures-core to futures-task

Author: taiki-e

futures-util/src/task/arc_wake.rs renamed to futures-task/src/arc_wake.rs

@@ -19,12 +19,42 @@ compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feat
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
+macro_rules! cfg_target_has_atomic {
+    ($($item:item)*) => {$(
+        #[cfg_attr(feature = "cfg-target-has-atomic", cfg(target_has_atomic = "ptr"))]
+        $item
+    )*};
+}
+
 mod spawn;
 pub use crate::spawn::{Spawn, SpawnError, LocalSpawn};
 
-#[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_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")]
+    pub use crate::arc_wake::ArcWake;
+
+    #[cfg(feature = "alloc")]
+    mod waker;
+    #[cfg(feature = "alloc")]
+    pub use crate::waker::waker;
+
+    #[cfg(feature = "alloc")]
+    mod waker_ref;
+    #[cfg(feature = "alloc")]
+    pub use crate::waker_ref::{waker_ref, WakerRef};
+}
+
+mod noop_waker;
+pub use crate::noop_waker::noop_waker;
+#[cfg(feature = "std")]
+pub use crate::noop_waker::noop_waker_ref;
 
 pub use futures_core::future::{FutureObj, LocalFutureObj};
+pub use futures_core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};

futures-task/src/lib.rs

@@ -1,4 +1,5 @@
 //! Utilities for creating zero-cost wakers that don't do anything.
+
 use futures_core::task::{RawWaker, RawWakerVTable, Waker};
 use core::ptr::null;
 #[cfg(feature = "std")]

futures-util/src/task/noop_waker.rs renamed to futures-task/src/noop_waker.rs

@@ -2,30 +2,24 @@
 
 cfg_target_has_atomic! {
     #[cfg(feature = "alloc")]
-    mod arc_wake;
-    #[cfg(feature = "alloc")]
-    pub use self::arc_wake::ArcWake;
+    pub use futures_task::ArcWake;
 
     #[cfg(feature = "alloc")]
-    mod waker;
-    #[cfg(feature = "alloc")]
-    pub use self::waker::waker;
+    pub use futures_task::waker;
 
     #[cfg(feature = "alloc")]
-    mod waker_ref;
-    #[cfg(feature = "alloc")]
-    pub use self::waker_ref::{waker_ref, WakerRef};
+    pub use futures_task::{waker_ref, WakerRef};
 
     pub use futures_task::AtomicWaker;
 }
 
-mod noop_waker;
-pub use self::noop_waker::noop_waker;
-#[cfg(feature = "std")]
-pub use self::noop_waker::noop_waker_ref;
-
 mod spawn;
 pub use self::spawn::{SpawnExt, LocalSpawnExt};
 
 pub use futures_core::task::{Context, Poll, Waker, RawWaker, RawWakerVTable};
+
 pub use futures_task::{Spawn, LocalSpawn, SpawnError};
+
+pub use futures_task::noop_waker;
+#[cfg(feature = "std")]
+pub use futures_task::noop_waker_ref;