1 files changed, 22 insertions, 8 deletions
diff --git a/cli/tokio_util.rs b/cli/tokio_util.rs
index 3bf82f314..6ffc57b1a 100644
--- a/cli/tokio_util.rs
+++ b/cli/tokio_util.rs
@@ -1,15 +1,29 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
+use futures::Future;
 
-#[cfg(test)]
-pub fn run<F>(future: F)
+// TODO(ry) rename to run_local ?
+pub fn run_basic<F, R>(future: F) -> R
 where
-  F: std::future::Future<Output = ()> + Send + 'static,
+  F: std::future::Future<Output = R> + 'static,
 {
   let mut rt = tokio::runtime::Builder::new()
-    .threaded_scheduler()
-    .enable_all()
-    .thread_name("deno")
+    .basic_scheduler()
+    .enable_io()
+    .enable_time()
     .build()
-    .expect("Unable to create Tokio runtime");
-  rt.block_on(future);
+    .unwrap();
+  rt.block_on(future)
+}
+
+pub fn spawn_thread<F, R>(f: F) -> impl Future<Output = R>
+where
+  F: 'static + Send + FnOnce() -> R,
+  R: 'static + Send,
+{
+  let (sender, receiver) = tokio::sync::oneshot::channel::<R>();
+  std::thread::spawn(move || {
+    let result = f();
+    sender.send(result)
+  });
+  async { receiver.await.unwrap() }
 }