Move CancellationToken into sync module

Author: Matthias247

tokio/src/lib.rs

@@ -368,10 +368,6 @@ pub mod runtime;
 
 pub(crate) mod coop;
 
-cfg_scope! {
-    pub mod scope;
-}
-
 cfg_signal! {
     pub mod signal;
 }

tokio/src/macros/cfg.rs

@@ -187,16 +187,6 @@ macro_rules! cfg_process {
     }
 }
 
-macro_rules! cfg_scope {
-    ($($item:item)*) => {
-        $(
-            #[cfg(feature = "scope")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "scope")))]
-            $item
-        )*
-    }
-}
-
 macro_rules! cfg_signal {
     ($($item:item)*) => {
         $(

tokio/src/scope/mod.rs

@@ -425,6 +425,11 @@ cfg_sync! {
 
     pub mod broadcast;
 
+    #[cfg(tokio_unstable)]
+    mod cancellation_token;
+    #[cfg(tokio_unstable)]
+    pub use cancellation_token::{CancellationToken, WaitForCancellationFuture};
+
     pub mod mpsc;
 
     mod mutex;

tokio/src/scope/tests/mod.rs

@@ -7,6 +7,8 @@ cfg_not_loom! {
 cfg_loom! {
     mod loom_atomic_waker;
     mod loom_broadcast;
+    #[cfg(tokio_unstable)]
+    mod loom_cancellation_token;
     mod loom_list;
     mod loom_mpsc;
     mod loom_notify;