From 92532612b75d1e2d1ff93440f760e5718acb1824 Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Mon, 27 Apr 2020 22:15:04 +0200
Subject: [PATCH] mark spawn_local unstable

---
 src/io/read/mod.rs  |  2 +-
 src/task/builder.rs | 25 +++++++++++++++++++++++--
 src/task/mod.rs     |  8 ++++++--
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/io/read/mod.rs b/src/io/read/mod.rs
index 0d42920..388237c 100644
--- a/src/io/read/mod.rs
+++ b/src/io/read/mod.rs
@@ -477,7 +477,7 @@ unsafe fn initialize<R: futures_io::AsyncRead>(_reader: &R, buf: &mut [u8]) {
     std::ptr::write_bytes(buf.as_mut_ptr(), 0, buf.len())
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_os = "unknown")))]
 mod tests {
     use crate::io;
     use crate::prelude::*;
diff --git a/src/task/builder.rs b/src/task/builder.rs
index f48b6b4..91e2cb6 100644
--- a/src/task/builder.rs
+++ b/src/task/builder.rs
@@ -61,7 +61,7 @@ impl Builder {
     }
 
     /// Spawns a task locally with the configured settings.
-    #[cfg(not(target_os = "unknown"))]
+    #[cfg(all(not(target_os = "unknown"), feature = "unstable"))]
     pub fn local<F, T>(self, future: F) -> io::Result<JoinHandle<T>>
     where
         F: Future<Output = T> + 'static,
@@ -76,7 +76,7 @@ impl Builder {
     }
 
     /// Spawns a task locally with the configured settings.
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(all(target_arch = "wasm32", feature = "unstable"))]
     pub fn local<F, T>(self, future: F) -> io::Result<JoinHandle<T>>
     where
         F: Future<Output = T> + 'static,
@@ -96,6 +96,27 @@ impl Builder {
         Ok(JoinHandle::new(receiver, task))
     }
 
+    /// Spawns a task locally with the configured settings.
+    #[cfg(all(target_arch = "wasm32", not(feature = "unstable")))]
+    pub(crate) fn local<F, T>(self, future: F) -> io::Result<JoinHandle<T>>
+    where
+        F: Future<Output = T> + 'static,
+        T: 'static,
+    {
+        use futures_channel::oneshot::channel;
+        let (sender, receiver) = channel();
+
+        let wrapped = self.build(async move {
+            let res = future.await;
+            let _ = sender.send(res);
+        });
+
+        let task = wrapped.tag.task().clone();
+        wasm_bindgen_futures::spawn_local(wrapped);
+
+        Ok(JoinHandle::new(receiver, task))
+    }
+
     /// Spawns a task with the configured settings, blocking on its execution.
     #[cfg(not(target_os = "unknown"))]
     pub fn blocking<F, T>(self, future: F) -> T
diff --git a/src/task/mod.rs b/src/task/mod.rs
index 6a142ff..eefc7c2 100644
--- a/src/task/mod.rs
+++ b/src/task/mod.rs
@@ -140,7 +140,6 @@ cfg_default! {
     pub use sleep::sleep;
     #[cfg(not(target_os = "unknown"))]
     pub use spawn::spawn;
-    pub use spawn_local::spawn_local;
     pub use task_local::{AccessError, LocalKey};
 
     pub(crate) use task_local::LocalsMap;
@@ -155,7 +154,6 @@ cfg_default! {
     mod spawn;
     #[cfg(not(target_os = "unknown"))]
     mod spawn_blocking;
-    mod spawn_local;
     mod task;
     mod task_id;
     mod task_local;
@@ -168,3 +166,9 @@ cfg_default! {
     #[cfg(not(any(feature = "unstable", test)))]
     pub(crate) use spawn_blocking::spawn_blocking;
 }
+
+cfg_unstable! {
+    pub use spawn_local::spawn_local;
+
+    mod spawn_local;
+}