From d70c928d88dff9e3e8d673b8ee02bce131598550 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Fri, 1 Nov 2019 13:18:52 -0700 Subject: runtime: merge multi & single threaded runtimes (#1716) Simplify Tokio's runtime construct by combining both Runtime variants into a single type. The execution style can be controlled by a configuration setting on `Builder`. The implication of this change is that there is no longer any way to spawn `!Send` futures. This, however, is a temporary limitation. A different strategy will be employed for supporting `!Send` futures. Included in this patch is a rework of `task::JoinHandle` to support using this type from both the thread-pool and current-thread executors. --- tokio-test/src/lib.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'tokio-test') diff --git a/tokio-test/src/lib.rs b/tokio-test/src/lib.rs index 58499bbb..749112d8 100644 --- a/tokio-test/src/lib.rs +++ b/tokio-test/src/lib.rs @@ -26,15 +26,9 @@ pub mod task; /// /// [runtime-block-on]: https://docs.rs/tokio/0.2.0-alpha.2/tokio/runtime/current_thread/struct.Runtime.html#method.block_on pub fn block_on(future: F) -> F::Output { - let mut rt = tokio::runtime::current_thread::Runtime::new().unwrap(); - rt.block_on(future) -} + use tokio::runtime; -/* -#[doc(hidden)] -pub mod codegen { - pub mod futures { - pub use futures::*; - } + let mut rt = runtime::Builder::new().current_thread().build().unwrap(); + + rt.block_on(future) } -*/ -- cgit v1.2.3