diff options
| author | Carl Lerche <me@carllerche.com> | 2019-11-01 13:18:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 13:18:52 -0700 |
| commit | d70c928d88dff9e3e8d673b8ee02bce131598550 (patch) | |
| tree | 6b079db2f80bd61764203a32ffe48769d18c1386 /tokio-test | |
| parent | 742d89b0f333150f6a550ae7840235851f4eb069 (diff) | |
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.
Diffstat (limited to 'tokio-test')
| -rw-r--r-- | tokio-test/src/lib.rs | 14 |
1 files changed, 4 insertions, 10 deletions
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<F: std::future::Future>(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) } -*/ |