Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mati865 committed Aug 8, 2018
1 parent decc83e commit ee8bfcd
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ mio = "0.6.14"
tokio-codec = { version = "0.1.0", path = "tokio-codec" }

bytes = "0.4"
env_logger = { version = "0.4", default-features = false }
env_logger = { version = "0.5", default-features = false }
flate2 = { version = "1", features = ["tokio"] }
futures-cpupool = "0.1"
http = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions tests/clock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ impl tokio_timer::clock::Now for MockNow {

#[test]
fn clock_and_timer_concurrent() {
let _ = env_logger::init();
let _ = env_logger::try_init();

let when = Instant::now() + Duration::from_millis(5_000);
let clock = Clock::new_with_now(MockNow(when));
Expand All @@ -48,7 +48,7 @@ fn clock_and_timer_concurrent() {

#[test]
fn clock_and_timer_single_threaded() {
let _ = env_logger::init();
let _ = env_logger::try_init();

let when = Instant::now() + Duration::from_millis(5_000);
let clock = Clock::new_with_now(MockNow(when));
Expand Down
4 changes: 2 additions & 2 deletions tests/global.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ macro_rules! t {

#[test]
fn hammer_old() {
let _ = env_logger::init();
let _ = env_logger::try_init();

let threads = (0..10).map(|_| {
thread::spawn(|| {
Expand Down Expand Up @@ -77,7 +77,7 @@ fn hammer_split() {
const N: usize = 100;
const ITER: usize = 10;

let _ = env_logger::init();
let _ = env_logger::try_init();

for _ in 0..ITER {
let srv = t!(TcpListener::bind(&"127.0.0.1:0".parse().unwrap()));
Expand Down
4 changes: 2 additions & 2 deletions tests/global2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ macro_rules! t {

#[test]
fn hammer() {
let _ = env_logger::init();
let _ = env_logger::try_init();

let threads = (0..10).map(|_| {
thread::spawn(|| {
Expand Down Expand Up @@ -75,7 +75,7 @@ impl AsyncWrite for Wr {
fn hammer_split() {
const N: usize = 100;

let _ = env_logger::init();
let _ = env_logger::try_init();

let srv = t!(TcpListener::bind(&"127.0.0.1:0".parse().unwrap()));
let addr = t!(srv.local_addr());
Expand Down
8 changes: 4 additions & 4 deletions tests/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ fn create_client_server_future() -> Box<Future<Item=(), Error=()> + Send> {

#[test]
fn runtime_tokio_run() {
let _ = env_logger::init();
let _ = env_logger::try_init();

tokio::run(create_client_server_future());
}

#[test]
fn runtime_single_threaded() {
let _ = env_logger::init();
let _ = env_logger::try_init();

let mut runtime = tokio::runtime::current_thread::Runtime::new()
.unwrap();
Expand All @@ -67,7 +67,7 @@ fn runtime_single_threaded() {

#[test]
fn runtime_single_threaded_block_on() {
let _ = env_logger::init();
let _ = env_logger::try_init();

tokio::runtime::current_thread::block_on_all(create_client_server_future()).unwrap();
}
Expand Down Expand Up @@ -135,7 +135,7 @@ fn runtime_single_threaded_racy_spawn() {

#[test]
fn runtime_multi_threaded() {
let _ = env_logger::init();
let _ = env_logger::try_init();

let mut runtime = tokio::runtime::Builder::new()
.build()
Expand Down
6 changes: 3 additions & 3 deletions tests/timer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use std::time::{Duration, Instant};

#[test]
fn timer_with_runtime() {
let _ = env_logger::init();
let _ = env_logger::try_init();

let when = Instant::now() + Duration::from_millis(100);
let (tx, rx) = mpsc::channel();
Expand All @@ -33,7 +33,7 @@ fn timer_with_runtime() {
fn starving() {
use futures::{task, Poll, Async};

let _ = env_logger::init();
let _ = env_logger::try_init();

struct Starve(Delay, u64);

Expand Down Expand Up @@ -75,7 +75,7 @@ fn starving() {
fn deadline() {
use futures::future;

let _ = env_logger::init();
let _ = env_logger::try_init();

let when = Instant::now() + Duration::from_millis(20);
let (tx, rx) = mpsc::channel();
Expand Down
2 changes: 1 addition & 1 deletion tokio-fs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tokio-threadpool = { version = "0.1.3", path = "../tokio-threadpool" }
tokio-io = { version = "0.1.6", path = "../tokio-io" }

[dev-dependencies]
rand = "0.4.2"
rand = "0.5"
tempdir = "0.3.7"
tokio-io = { version = "0.1.6", path = "../tokio-io" }
tokio-codec = { version = "0.1.0", path = "../tokio-codec" }
Expand Down
2 changes: 1 addition & 1 deletion tokio-tcp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ iovec = "0.1"
futures = "0.1.19"

[dev-dependencies]
env_logger = { version = "0.4", default-features = false }
env_logger = { version = "0.5", default-features = false }
4 changes: 2 additions & 2 deletions tokio-threadpool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ rand = "0.5"
log = "0.4"

[dev-dependencies]
tokio-timer = "0.1"
env_logger = "0.4"
tokio-timer = "0.2"
env_logger = "0.5"

# For comparison benchmarks
futures-cpupool = "0.1.7"
Expand Down
2 changes: 1 addition & 1 deletion tokio-timer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ futures = "0.1.19"
tokio-executor = { version = "0.1.1", path = "../tokio-executor" }

[dev-dependencies]
rand = "0.4.2"
rand = "0.5"
2 changes: 1 addition & 1 deletion tokio-udp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ log = "0.4"
futures = "0.1.19"

[dev-dependencies]
env_logger = { version = "0.4", default-features = false }
env_logger = { version = "0.5", default-features = false }

0 comments on commit ee8bfcd

Please sign in to comment.