Merge pull request #806 from async-rs/fix-feature-unstable

Cargo.toml

@@ -29,9 +29,13 @@ default = [
   "log",
   "num_cpus",
   "pin-project-lite",
+  "smol",
 ]
 docs = ["attributes", "unstable", "default"]
-unstable = ["std"]
+unstable = [
+  "std",
+  "futures-timer",  
+]
 attributes = ["async-attributes"]
 std = [
   "alloc",
@@ -42,8 +46,6 @@ std = [
   "once_cell",
   "pin-utils",
   "slab",
-  "smol",
-  "futures-timer",
   "wasm-bindgen-futures",
   "futures-channel",
 ]
@@ -67,6 +69,7 @@ once_cell = { version = "1.3.1", optional = true }
 pin-project-lite = { version = "0.1.4", optional = true }
 pin-utils = { version = "0.1.0-alpha.4", optional = true }
 slab = { version = "0.4.2", optional = true }
+futures-timer = { version = "3.0.2", optional = true }
 
 # Devdepencency, but they are not allowed to be optional :/
 surf = { version = "1.0.3", optional = true }

src/future/mod.rs

@@ -61,10 +61,10 @@ cfg_std! {
     mod ready;
 }
 
-cfg_default! {
+#[cfg(any(feature = "unstable", feature = "default"))]
 pub use timeout::{timeout, TimeoutError};
+#[cfg(any(feature = "unstable", feature = "default"))]
 mod timeout;
-}
 
 cfg_unstable! {
     pub use into_future::IntoFuture;

src/task/mod.rs

@@ -168,7 +168,9 @@ cfg_default! {
 }
 
 cfg_unstable! {
+    #[cfg(feature = "default")]
     pub use spawn_local::spawn_local;
 
+    #[cfg(feature = "default")]
     mod spawn_local;
 }

src/utils.rs

@@ -60,25 +60,27 @@ pub(crate) trait Context {
 }
 
 #[cfg(all(not(target_os = "unknown"), feature = "default"))]
-pub(crate) type Timer = smol::Timer;
+mod timer {
+    pub type Timer = smol::Timer;
+}
+
+#[cfg(any(
+    all(target_arch = "wasm32", feature = "default"),
+    all(feature = "unstable", not(feature = "default"))
+))]
+mod timer {
+    use std::pin::Pin;
+    use std::task::Poll;
 
-#[cfg(all(target_arch = "wasm32", feature = "default"))]
     #[derive(Debug)]
     pub(crate) struct Timer(futures_timer::Delay);
 
-#[cfg(all(target_arch = "wasm32", feature = "default"))]
     impl Timer {
         pub(crate) fn after(dur: std::time::Duration) -> Self {
             Timer(futures_timer::Delay::new(dur))
         }
     }
 
-#[cfg(target_arch = "wasm32")]
-use std::pin::Pin;
-#[cfg(target_arch = "wasm32")]
-use std::task::Poll;
-
-#[cfg(target_arch = "wasm32")]
     impl std::future::Future for Timer {
         type Output = ();
 
@@ -89,6 +91,10 @@ impl std::future::Future for Timer {
             }
         }
     }
+}
+
+#[cfg(any(feature = "unstable", feature = "default"))]
+pub(crate) use timer::*;
 
 /// Defers evaluation of a block of code until the end of the scope.
 #[cfg(feature = "default")]