From c8cf8c5464a6bb806467457b526831e855e5f17d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Sep 2022 15:44:31 +0000 Subject: [PATCH] build(deps): bump tokio from 1.20.1 to 1.21.0 (#5058) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.20.1 to 1.21.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.20.1...tokio-1.21.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 85 ++++++++++++++++++++++++-------------- tower-batch/Cargo.toml | 4 +- tower-fallback/Cargo.toml | 2 +- zebra-chain/Cargo.toml | 4 +- zebra-consensus/Cargo.toml | 4 +- zebra-network/Cargo.toml | 4 +- zebra-rpc/Cargo.toml | 4 +- zebra-state/Cargo.toml | 4 +- zebra-test/Cargo.toml | 2 +- zebrad/Cargo.toml | 4 +- 10 files changed, 70 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f41e1aae..b4bcee23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2778,25 +2778,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", - "miow", - "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "windows-sys 0.36.1", ] [[package]] @@ -2863,15 +2852,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num-bigint" version = "0.4.3" @@ -3160,7 +3140,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec 1.8.0", - "windows-sys", + "windows-sys 0.32.0", ] [[package]] @@ -4872,9 +4852,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42" dependencies = [ "autocfg 1.1.0", "bytes", @@ -6022,11 +6002,24 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.32.0", + "windows_i686_gnu 0.32.0", + "windows_i686_msvc 0.32.0", + "windows_x86_64_gnu 0.32.0", + "windows_x86_64_msvc 0.32.0", +] + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] [[package]] @@ -6035,30 +6028,60 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + [[package]] name = "windows_i686_gnu" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + [[package]] name = "windows_i686_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + [[package]] name = "windows_x86_64_gnu" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + [[package]] name = "windows_x86_64_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "winreg" version = "0.10.1" diff --git a/tower-batch/Cargo.toml b/tower-batch/Cargo.toml index 67123b1b..2fd02a65 100644 --- a/tower-batch/Cargo.toml +++ b/tower-batch/Cargo.toml @@ -10,7 +10,7 @@ futures = "0.3.23" futures-core = "0.3.24" pin-project = "1.0.10" rayon = "1.5.3" -tokio = { version = "1.20.1", features = ["time", "sync", "tracing", "macros"] } +tokio = { version = "1.21.0", features = ["time", "sync", "tracing", "macros"] } tokio-util = "0.7.3" tower = { version = "0.4.13", features = ["util", "buffer"] } tracing = "0.1.31" @@ -25,7 +25,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] } ed25519-zebra = "3.0.0" rand = { version = "0.8.5", package = "rand" } -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } tokio-test = "0.4.2" tower-fallback = { path = "../tower-fallback/" } tower-test = "0.4.0" diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index 57f30a75..57543cc5 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -12,6 +12,6 @@ futures-core = "0.3.24" tracing = "0.1.31" [dev-dependencies] -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } zebra-test = { path = "../zebra-test/" } diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 0a412216..46aff6eb 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -80,7 +80,7 @@ proptest-derive = { version = "0.3.0", optional = true } rand = { version = "0.8.5", optional = true, package = "rand" } rand_chacha = { version = "0.3.1", optional = true } -tokio = { version = "1.20.1", features = ["tracing"], optional = true } +tokio = { version = "1.21.0", features = ["tracing"], optional = true } zebra-test = { path = "../zebra-test/", optional = true } @@ -103,7 +103,7 @@ proptest-derive = "0.3.0" rand = { version = "0.8.5", package = "rand" } rand_chacha = "0.3.1" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } zebra-test = { path = "../zebra-test/" } diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 0a6728b5..ddf4b006 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -29,7 +29,7 @@ futures = "0.3.23" futures-util = "0.3.24" metrics = "0.18.1" thiserror = "1.0.33" -tokio = { version = "1.20.1", features = ["time", "sync", "tracing", "rt-multi-thread"] } +tokio = { version = "1.21.0", features = ["time", "sync", "tracing", "rt-multi-thread"] } tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] } tracing = "0.1.31" tracing-futures = "0.2.5" @@ -60,7 +60,7 @@ proptest-derive = "0.3.0" rand07 = { package = "rand", version = "0.7" } spandoc = "0.2.2" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } tracing-error = "0.2.0" tracing-subscriber = "0.3.11" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index ba0deb88..cda59933 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -30,7 +30,7 @@ serde = { version = "1.0.144", features = ["serde_derive"] } thiserror = "1.0.33" futures = "0.3.23" -tokio = { version = "1.20.1", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] } +tokio = { version = "1.21.0", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] } tokio-stream = { version = "0.1.9", features = ["sync", "time"] } tokio-util = { version = "0.7.3", features = ["codec"] } tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } @@ -55,7 +55,7 @@ proptest = "0.10.1" proptest-derive = "0.3.0" static_assertions = "1.1.0" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } toml = "0.5.9" zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 903e05c1..f01bea76 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -25,7 +25,7 @@ jsonrpc-http-server = "18.0.0" serde_json = { version = "1.0.85", features = ["preserve_order"] } indexmap = { version = "1.9.1", features = ["serde"] } -tokio = { version = "1.20.1", features = ["time", "rt-multi-thread", "macros", "tracing"] } +tokio = { version = "1.21.0", features = ["time", "rt-multi-thread", "macros", "tracing"] } tower = "0.4.13" tracing = "0.1.31" @@ -49,7 +49,7 @@ proptest-derive = "0.3.0" serde_json = "1.0.85" thiserror = "1.0.33" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } zebra-state = { path = "../zebra-state", features = ["proptest-impl"] } diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index 8ff99e57..4acd3ec6 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -27,7 +27,7 @@ tempfile = "3.3.0" thiserror = "1.0.33" rayon = "1.5.3" -tokio = { version = "1.20.1", features = ["sync", "tracing"] } +tokio = { version = "1.21.0", features = ["sync", "tracing"] } tower = { version = "0.4.13", features = ["buffer", "util"] } tracing = "0.1.31" @@ -55,7 +55,7 @@ proptest-derive = "0.3.0" halo2 = { package = "halo2_proofs", version = "0.2.0" } jubjub = "0.9.0" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } zebra-test = { path = "../zebra-test/" } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 66f24dd9..95518c0d 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -17,7 +17,7 @@ once_cell = "1.13.0" rand = { version = "0.8.5", package = "rand" } regex = "1.6.0" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } tower = { version = "0.4.13", features = ["util"] } futures = "0.3.23" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index f6a43796..41381f7f 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -87,7 +87,7 @@ toml = "0.5.9" futures = "0.3.23" rayon = "1.5.3" -tokio = { version = "1.20.1", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } +tokio = { version = "1.21.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } tower = { version = "0.4.13", features = ["hedge", "limit"] } pin-project = "1.0.10" @@ -161,7 +161,7 @@ tempfile = "3.3.0" hyper = { version = "0.14.20", features = ["http1", "http2", "server"]} reqwest = "0.11.11" -tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] } +tokio = { version = "1.21.0", features = ["full", "tracing", "test-util"] } tokio-stream = "0.1.9" # test feature lightwalletd-grpc-tests