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.

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"

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;

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;