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/src/executor/thread_pool/pool.rs | |
| 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/src/executor/thread_pool/pool.rs')
| -rw-r--r-- | tokio/src/executor/thread_pool/pool.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tokio/src/executor/thread_pool/pool.rs b/tokio/src/executor/thread_pool/pool.rs index 6a83e97d..6ffcbba4 100644 --- a/tokio/src/executor/thread_pool/pool.rs +++ b/tokio/src/executor/thread_pool/pool.rs @@ -1,5 +1,6 @@ use crate::executor::blocking::PoolWaiter; -use crate::executor::thread_pool::{shutdown, Builder, JoinHandle, Spawner}; +use crate::executor::task::JoinHandle; +use crate::executor::thread_pool::{shutdown, Builder, Spawner}; use crate::executor::Executor; use std::fmt; |