From 78ca103f3a0bd3a3594387273df916b848c90b1a Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 9 Mar 2017 09:06:37 -0800 Subject: [PATCH] signal: Update to tokio-io --- Cargo.toml | 8 ++++---- src/lib.rs | 3 ++- src/unix.rs | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6b40011fc..a3ac2bccc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,15 +16,15 @@ travis-ci = { repository = "alexcrichton/tokio-signal" } appveyor = { repository = "alexcrichton/tokio-signal" } [dependencies] -tokio-core = "0.1.4" -futures = "0.1.7" +futures = "0.1.11" +mio = "0.6.5" +tokio-core = "0.1.6" +tokio-io = "0.1" [target.'cfg(unix)'.dependencies] libc = "0.2" -mio = "0.6" mio-uds = "0.6" [target.'cfg(windows)'.dependencies] winapi = "0.2" kernel32-sys = "0.2" -mio = "0.6" diff --git a/src/lib.rs b/src/lib.rs index 780d7f0bf..1611f9f1f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,11 +25,12 @@ #[macro_use] extern crate futures; extern crate tokio_core; +extern crate tokio_io; use futures::Future; use futures::stream::Stream; use tokio_core::reactor::Handle; -use tokio_core::io::{IoStream, IoFuture}; +use tokio_io::{IoStream, IoFuture}; pub mod unix; pub mod windows; diff --git a/src/unix.rs b/src/unix.rs index 2021feee1..b8ae0d2a6 100644 --- a/src/unix.rs +++ b/src/unix.rs @@ -27,7 +27,7 @@ use self::mio::Poll as MioPoll; use self::mio::unix::EventedFd; use self::mio::{Evented, Token, Ready, PollOpt}; use self::mio_uds::UnixStream; -use tokio_core::io::IoFuture; +use tokio_io::IoFuture; use tokio_core::reactor::{Handle, CoreId, PollEvented}; pub use self::libc::{SIGINT, SIGTERM, SIGUSR1, SIGUSR2};