From f7d57fd70be067ef673261a3bf35cbf53b1c407b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2019 07:25:02 +0000 Subject: [PATCH] Bump tokio from 0.2.4 to 0.2.6 Bumps [tokio](/~https://github.com/tokio-rs/tokio) from 0.2.4 to 0.2.6. - [Release notes](/~https://github.com/tokio-rs/tokio/releases) - [Commits](/~https://github.com/tokio-rs/tokio/compare/tokio-0.2.4...tokio-0.2.6) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- fuzz/Cargo.lock | 10 +++++----- src/cli/real_main.rs | 2 +- src/main.rs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index afc3b5f0..a53f6fd4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -445,7 +445,7 @@ dependencies = [ "inotify-sys 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+/~https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+/~https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.4 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1153,7 +1153,7 @@ dependencies = [ "serde 1.0.104 (registry+/~https://github.com/rust-lang/crates.io-index)", "structopt 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)", "tai64 3.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.4 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)", "tokio-util 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "toml 0.5.5 (registry+/~https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.9 (registry+/~https://github.com/rust-lang/crates.io-index)", @@ -1166,7 +1166,7 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.4" +version = "0.2.6" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.5.1 (registry+/~https://github.com/rust-lang/crates.io-index)", @@ -1204,7 +1204,7 @@ dependencies = [ "futures-sink 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", "log 0.4.10 (registry+/~https://github.com/rust-lang/crates.io-index)", "pin-project-lite 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.4 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1592,7 +1592,7 @@ dependencies = [ "checksum textwrap 0.11.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" "checksum thread_local 0.3.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" "checksum tinytemplate 1.0.2 (registry+/~https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20" -"checksum tokio 0.2.4 (registry+/~https://github.com/rust-lang/crates.io-index)" = "bcced6bb623d4bff3739c176c415f13c418f426395c169c9c3cd9a492c715b16" +"checksum tokio 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0e1bef565a52394086ecac0a6fa3b8ace4cb3a138ee1d96bd2b93283b56824e3" "checksum tokio-macros 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d5795a71419535c6dcecc9b6ca95bdd3c2d6142f7e8343d7beb9923f129aa87e" "checksum tokio-util 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" "checksum toml 0.5.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" diff --git a/Cargo.toml b/Cargo.toml index 63dc9feb..89cec305 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ num-traits = "0.2.10" tokio-util = { version = "0.2.0", features = ["codec"] } [dependencies.tokio] -version = "0.2.4" +version = "0.2.6" features = [ "io-std", "io-driver", diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index b9051c14..978b3312 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -313,7 +313,7 @@ dependencies = [ "inotify-sys 0.1.3 (registry+/~https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+/~https://github.com/rust-lang/crates.io-index)", "mio 0.6.21 (registry+/~https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.4 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -877,7 +877,7 @@ dependencies = [ "serde 1.0.104 (registry+/~https://github.com/rust-lang/crates.io-index)", "structopt 0.3.5 (registry+/~https://github.com/rust-lang/crates.io-index)", "tai64 3.1.0 (registry+/~https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.4 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)", "tokio-util 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)", "toml 0.5.5 (registry+/~https://github.com/rust-lang/crates.io-index)", "wchar 0.6.0 (registry+/~https://github.com/rust-lang/crates.io-index)", @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.4" +version = "0.2.6" source = "registry+/~https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.5.1 (registry+/~https://github.com/rust-lang/crates.io-index)", @@ -937,7 +937,7 @@ dependencies = [ "futures-sink 0.3.1 (registry+/~https://github.com/rust-lang/crates.io-index)", "log 0.4.10 (registry+/~https://github.com/rust-lang/crates.io-index)", "pin-project-lite 0.1.1 (registry+/~https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.4 (registry+/~https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1281,7 +1281,7 @@ dependencies = [ "checksum termcolor 1.0.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" "checksum textwrap 0.11.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" "checksum thread_local 0.3.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -"checksum tokio 0.2.4 (registry+/~https://github.com/rust-lang/crates.io-index)" = "bcced6bb623d4bff3739c176c415f13c418f426395c169c9c3cd9a492c715b16" +"checksum tokio 0.2.6 (registry+/~https://github.com/rust-lang/crates.io-index)" = "0e1bef565a52394086ecac0a6fa3b8ace4cb3a138ee1d96bd2b93283b56824e3" "checksum tokio-macros 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "d5795a71419535c6dcecc9b6ca95bdd3c2d6142f7e8343d7beb9923f129aa87e" "checksum tokio-util 0.2.0 (registry+/~https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" "checksum toml 0.5.5 (registry+/~https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" diff --git a/src/cli/real_main.rs b/src/cli/real_main.rs index 3f344307..a545f9d7 100644 --- a/src/cli/real_main.rs +++ b/src/cli/real_main.rs @@ -178,7 +178,7 @@ impl Options { let mut rt = tokio::runtime::Builder::new() .enable_all() .threaded_scheduler() - .num_threads(threads) + .core_threads(threads) .build()?; rt.block_on(cli::run(config, notify, stop_rx)) } else { diff --git a/src/main.rs b/src/main.rs index 2ffff26d..a44e8d23 100644 --- a/src/main.rs +++ b/src/main.rs @@ -158,7 +158,7 @@ fn main() { .enable_all() // Have to use threaded because we use `block_in_place`. .threaded_scheduler() - .num_threads(1) + .core_threads(1) .build() .context("build tokio runtime")?;