diff options
| author | Carl Lerche <me@carllerche.com> | 2019-10-28 21:40:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 21:40:29 -0700 |
| commit | c62ef2d232dea1535a8e22484fa2ca083f03e903 (patch) | |
| tree | 40cacadf882433fa22a87c4911e160581b596ed8 /tokio-test | |
| parent | 7eb264a0d0ee68433b20ecafabed53a70a9d43a4 (diff) | |
executor: move into `tokio` crate (#1702)
A step towards collapsing Tokio sub crates into a single `tokio`
crate (#1318).
The executor implementation is now provided by the main `tokio` crate.
Functionality can be opted out of by using the various net related
feature flags.
Diffstat (limited to 'tokio-test')
| -rw-r--r-- | tokio-test/Cargo.toml | 1 | ||||
| -rw-r--r-- | tokio-test/src/clock.rs | 2 | ||||
| -rw-r--r-- | tokio-test/src/task.rs | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/tokio-test/Cargo.toml b/tokio-test/Cargo.toml index b53f9f0b..d5f63723 100644 --- a/tokio-test/Cargo.toml +++ b/tokio-test/Cargo.toml @@ -21,7 +21,6 @@ categories = ["asynchronous", "testing"] [dependencies] tokio = { version = "=0.2.0-alpha.6", path = "../tokio" } -tokio-executor = { version = "=0.2.0-alpha.6", path = "../tokio-executor" } tokio-sync = { version = "=0.2.0-alpha.6", path = "../tokio-sync" } bytes = "0.4" diff --git a/tokio-test/src/clock.rs b/tokio-test/src/clock.rs index dd09a009..c5fac787 100644 --- a/tokio-test/src/clock.rs +++ b/tokio-test/src/clock.rs @@ -22,9 +22,9 @@ //! }); //! ``` +use tokio::executor::park::{Park, Unpark}; use tokio::timer::clock::{Clock, Now}; use tokio::timer::Timer; -use tokio_executor::park::{Park, Unpark}; use std::marker::PhantomData; use std::rc::Rc; diff --git a/tokio-test/src/task.rs b/tokio-test/src/task.rs index 91da41eb..5468749a 100644 --- a/tokio-test/src/task.rs +++ b/tokio-test/src/task.rs @@ -1,6 +1,6 @@ //! Futures task based helpers -use tokio_executor::enter; +use tokio::executor::enter; use pin_convert::AsPinMut; use std::future::Future; |