summaryrefslogtreecommitdiffstats
path: root/src/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-08-26 14:30:46 -0700
committerAlex Crichton <alex@alexcrichton.com>2016-08-26 14:39:47 -0700
commitf107c8d860137b41e509b179d605db30082cb0da (patch)
tree063e7b0c86785f70a63458e17183602e58d9c7f3 /src/lib.rs
parente71d509fee767d6b796ba18a5501f80f0fb4babc (diff)
Rename to tokio-core, add in futures-io
Renames the futures-mio crate to tokio-core, pulls in the futures-io crate under an `io` module, and gets everything compiling.
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 449dc600..3250a0dc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,7 +6,6 @@
#![deny(missing_docs)]
extern crate futures;
-extern crate futures_io;
extern crate mio;
extern crate slab;
@@ -16,9 +15,7 @@ extern crate scoped_tls;
#[macro_use]
extern crate log;
-#[path = "../../src/slot.rs"]
mod slot;
-#[path = "../../src/lock.rs"]
mod lock;
mod channel;
@@ -30,6 +27,8 @@ mod timeout;
mod timer_wheel;
mod udp;
+pub mod io;
+
pub use channel::{Sender, Receiver};
pub use event_loop::{Loop, LoopPin, LoopHandle, AddSource, AddTimeout};
pub use event_loop::{LoopData, AddLoopData, TimeoutToken, IoToken};