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.

2 files changed, 2 insertions, 2 deletions

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;