From ab8dd92f5764e95de96f91c3b6f579b9089c0cd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 04:06:07 +0000 Subject: [PATCH] Bump tokio from 0.2.24 to 1.3.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 0.2.24 to 1.3.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-0.2.24...tokio-1.3.0) Signed-off-by: dependabot[bot] --- Cargo.lock | 119 ++++++++++++++++++++++++++++++++++++++--------------- Cargo.toml | 2 +- 2 files changed, 87 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d2e411c..28577f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -400,7 +400,7 @@ dependencies = [ "serde_yaml", "structopt", "tempfile", - "tokio", + "tokio 1.3.0", "tracing", "tracing-futures", "tracing-subscriber", @@ -1247,7 +1247,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -1376,7 +1376,7 @@ dependencies = [ "strum", "tempdir", "thiserror", - "tokio", + "tokio 0.2.25", "tokio_safe_block_on", "toml", "tracing", @@ -1412,7 +1412,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "tokio", + "tokio 0.2.25", "tracing", "tracing-futures", ] @@ -1452,7 +1452,7 @@ dependencies = [ "serde", "serde_bytes", "thiserror", - "tokio", + "tokio 0.2.25", "tracing", ] @@ -1486,7 +1486,7 @@ dependencies = [ "shrinkwraprs", "tempdir", "thiserror", - "tokio", + "tokio 0.2.25", "tokio_safe_block_on", "tracing", "tracing-futures", @@ -1513,7 +1513,7 @@ dependencies = [ "serde", "serde_bytes", "thiserror", - "tokio", + "tokio 0.2.25", "tokio_safe_block_on", ] @@ -1564,7 +1564,7 @@ dependencies = [ "serde_json", "shrinkwraprs", "thiserror", - "tokio", + "tokio 0.2.25", "tokio_safe_block_on", "tracing", "tracing-futures", @@ -1603,7 +1603,7 @@ dependencies = [ "strum", "tempdir", "thiserror", - "tokio", + "tokio 0.2.25", "tokio_safe_block_on", "tracing", ] @@ -1672,7 +1672,7 @@ dependencies = [ "net2", "serde", "serde_bytes", - "tokio", + "tokio 0.2.25", "tokio-tungstenite", "tracing", "tracing-futures", @@ -1763,7 +1763,7 @@ dependencies = [ "itoa", "pin-project 1.0.4", "socket2", - "tokio", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -1778,7 +1778,7 @@ dependencies = [ "bytes 0.5.6", "hyper", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] @@ -1979,7 +1979,7 @@ dependencies = [ "serde_bytes", "shrinkwraprs", "thiserror", - "tokio", + "tokio 0.2.25", "url2", ] @@ -2002,7 +2002,7 @@ dependencies = [ "serde", "serde_bytes", "structopt", - "tokio", + "tokio 0.2.25", "tracing-subscriber", "webpki", ] @@ -2022,7 +2022,7 @@ dependencies = [ "rcgen", "rustls 0.17.0", "serde", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -2041,7 +2041,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tokio", + "tokio 0.2.25", "url2", ] @@ -2068,7 +2068,7 @@ dependencies = [ "ring", "subtle 2.4.0", "thiserror", - "tokio", + "tokio 0.2.25", "toml", ] @@ -2081,7 +2081,7 @@ dependencies = [ "ghost_actor", "lair_keystore_api", "tempfile", - "tokio", + "tokio 0.2.25", "tracing", ] @@ -2093,9 +2093,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.82" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" +checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" [[package]] name = "libnghttp2-sys" @@ -2264,6 +2264,19 @@ dependencies = [ "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a" +dependencies = [ + "libc", + "log", + "miow 0.3.6", + "ntapi", + "winapi 0.3.9", +] + [[package]] name = "mio-named-pipes" version = "0.1.7" @@ -2271,7 +2284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", - "mio", + "mio 0.6.23", "miow 0.3.6", "winapi 0.3.9", ] @@ -2284,7 +2297,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -2409,6 +2422,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-format" version = "0.4.0" @@ -2841,10 +2863,10 @@ dependencies = [ "err-derive", "futures", "libc", - "mio", + "mio 0.6.23", "quinn-proto", "rustls 0.17.0", - "tokio", + "tokio 0.2.25", "tracing", "webpki", ] @@ -3222,7 +3244,7 @@ dependencies = [ "pin-project-lite 0.2.4", "serde", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-tls", "url 2.2.0", "wasm-bindgen", @@ -3877,9 +3899,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ "bytes 0.5.6", "fnv", @@ -3888,14 +3910,34 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-named-pipes", "mio-uds", "num_cpus", "pin-project-lite 0.1.11", "signal-hook-registry", "slab", - "tokio-macros", + "tokio-macros 0.2.6", + "winapi 0.3.9", +] + +[[package]] +name = "tokio" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda" +dependencies = [ + "autocfg 1.0.1", + "bytes 1.0.1", + "libc", + "memchr", + "mio 0.7.9", + "num_cpus", + "once_cell", + "parking_lot 0.11.1", + "pin-project-lite 0.2.4", + "signal-hook-registry", + "tokio-macros 1.1.0", "winapi 0.3.9", ] @@ -3910,6 +3952,17 @@ dependencies = [ "syn", ] +[[package]] +name = "tokio-macros" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tokio-tls" version = "0.3.1" @@ -3917,7 +3970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -3930,7 +3983,7 @@ dependencies = [ "log", "native-tls", "pin-project 0.4.27", - "tokio", + "tokio 0.2.25", "tokio-tls", "tungstenite", ] @@ -3946,7 +3999,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.11", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -3956,7 +4009,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6fb7c6fbaf80432ed3ab96e1a5bf33ec1ed66a5206d4edf44910ba3ba3207d" dependencies = [ "futures", - "tokio", + "tokio 0.2.25", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 11f60e4..5855030 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ structopt = "0.3" tempfile = "3.1" # holochain_websocket uses tokio 0.2 # TODO: bump to 0.3 after https://github.com/holochain/holochain/pull/461 is merged -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "1.3", features = ["full"] } tracing = { version = "0.1", features = ["attributes"] } tracing-futures = "0.2" tracing-subscriber = "0.2"