diff options
author | Jake McGinty <me@jake.su> | 2018-05-17 18:40:00 -0700 |
---|---|---|
committer | Jake McGinty <me@jake.su> | 2018-05-17 19:44:58 -0700 |
commit | 39a0e8fc61c6af21b247e4ef97370a225bde1585 (patch) | |
tree | 49bcd3142c4afd09a844f1e0246a287b122b27e0 | |
parent | deps: upgrade to subtle 0.6 (diff) | |
download | wireguard-rs-39a0e8fc61c6af21b247e4ef97370a225bde1585.tar.xz wireguard-rs-39a0e8fc61c6af21b247e4ef97370a225bde1585.zip |
global: don't directly rely on tokio 'meta' crate
-rw-r--r-- | Cargo.lock | 2 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | src/lib.rs | 3 | ||||
-rw-r--r-- | src/main.rs | 1 | ||||
-rw-r--r-- | src/ratelimiter.rs | 2 | ||||
-rw-r--r-- | src/timer.rs | 2 |
6 files changed, 7 insertions, 5 deletions
@@ -1466,10 +1466,10 @@ dependencies = [ "structopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "structopt-derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "subtle 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-signal 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-uds 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-utun 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "treebitmap 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -49,12 +49,12 @@ pnet_packet = "^0.21" snow = { git = "https://github.com/mcginty/snow", features = ["ring-accelerated"], branch = "wireguard" } socket2 = "^0.3" subtle = "^0.6" -tokio = "^0.1.6" tokio-io = "^0.1" tokio-core = "^0.1" tokio-uds = "^0.1" tokio-utun = "^0.1.10" tokio-signal = "^0.1" +tokio-timer = "^0.2" treebitmap = "^0.2" x25519-dalek = "0.2" @@ -1,3 +1,4 @@ +#![allow(unknown_lints)] #![warn(clippy)] #![feature(ip_constructors)] #![feature(try_trait)] @@ -31,11 +32,11 @@ extern crate snow; extern crate socket2; extern crate subtle; extern crate test; -extern crate tokio; extern crate tokio_io; extern crate tokio_uds; extern crate tokio_utun; extern crate tokio_signal; +extern crate tokio_timer; extern crate treebitmap; extern crate x25519_dalek; diff --git a/src/main.rs b/src/main.rs index c056150..df37a75 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ #![feature(test)] +#![allow(unknown_lints)] #![warn(clippy)] #[macro_use] extern crate failure; diff --git a/src/ratelimiter.rs b/src/ratelimiter.rs index 18082b0..ee916fc 100644 --- a/src/ratelimiter.rs +++ b/src/ratelimiter.rs @@ -4,7 +4,7 @@ use timestamp::Timestamp; use failure::Error; use futures::{unsync::mpsc, Async, Future, Poll, Stream, Sink}; -use tokio::timer::Interval; +use tokio_timer::Interval; use tokio_core::reactor::Handle; use std::collections::HashMap; use std::net::IpAddr; diff --git a/src/timer.rs b/src/timer.rs index dc6188a..aea41e9 100644 --- a/src/timer.rs +++ b/src/timer.rs @@ -2,7 +2,7 @@ use consts::TIMER_RESOLUTION; use futures::{Future, Stream, Sink, Poll, unsync}; use std::{cell::RefCell, rc::Rc}; use std::time::{Instant, Duration}; -use tokio::timer::Delay; +use tokio_timer::Delay; use tokio_core::reactor::Handle; use interface::WeakSharedPeer; |