From 16f4dc00ea22195907fbf5bdf4905c4a1a091337 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 20:12:40 +0000 Subject: [PATCH] Bump tokio from 0.2.22 to 1.8.4 Bumps [tokio](https://github.com/tokio-rs/tokio) from 0.2.22 to 1.8.4. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-0.2.22...tokio-1.8.4) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 90 ++++++++++++++++++++++++++++------------------- rbac/Cargo.toml | 2 +- server/Cargo.toml | 2 +- 3 files changed, 56 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 754e9c9..ad85290 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "actix" version = "0.9.0" @@ -19,7 +21,7 @@ dependencies = [ "parking_lot 0.10.2", "pin-project", "smallvec", - "tokio", + "tokio 0.2.24", "tokio-util 0.2.0", "trust-dns-proto 0.18.0-alpha.2", "trust-dns-resolver 0.18.0-alpha.2", @@ -44,7 +46,7 @@ dependencies = [ "parking_lot 0.11.0", "pin-project", "smallvec", - "tokio", + "tokio 0.2.24", "tokio-util 0.3.1", "trust-dns-proto 0.19.5", "trust-dns-resolver 0.19.5", @@ -61,7 +63,7 @@ dependencies = [ "futures-core", "futures-sink", "log", - "tokio", + "tokio 0.2.24", "tokio-util 0.2.0", ] @@ -77,7 +79,7 @@ dependencies = [ "futures-sink", "log", "pin-project", - "tokio", + "tokio 0.2.24", "tokio-util 0.3.1", ] @@ -282,7 +284,7 @@ dependencies = [ "futures-channel", "futures-util", "smallvec", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -1279,7 +1281,7 @@ dependencies = [ "serde_urlencoded", "snafu", "structopt", - "tokio", + "tokio 1.8.4", "tracing", "tracing-futures", "tracing-subscriber", @@ -1565,7 +1567,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.24", "tokio-util 0.3.1", "tracing", ] @@ -1655,7 +1657,7 @@ dependencies = [ "rusoto_core", "rusoto_credential", "rusoto_s3", - "tokio", + "tokio 0.2.24", "tracing", "tracing-futures", ] @@ -1737,7 +1739,7 @@ dependencies = [ "itoa", "pin-project", "socket2", - "tokio", + "tokio 0.2.24", "tower-service", "tracing", "want", @@ -1756,7 +1758,7 @@ dependencies = [ "log", "rustls 0.17.0", "rustls-native-certs", - "tokio", + "tokio 0.2.24", "tokio-rustls 0.13.1", "webpki", ] @@ -1772,7 +1774,7 @@ dependencies = [ "hyper", "log", "rustls 0.18.1", - "tokio", + "tokio 0.2.24", "tokio-rustls 0.14.1", "webpki", ] @@ -1786,7 +1788,7 @@ dependencies = [ "bytes", "hyper", "native-tls", - "tokio", + "tokio 0.2.24", "tokio-tls", ] @@ -2445,6 +2447,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e555d9e657502182ac97b539fb3dae8b79cda19e3e4f8ffb5e8de4f18df93c95" +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + [[package]] name = "pin-utils" version = "0.1.0" @@ -2604,7 +2612,7 @@ dependencies = [ "log", "serde 1.0.116", "serde_json", - "tokio", + "tokio 1.8.4", "tracing", "tracing-futures", ] @@ -2687,12 +2695,12 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.1.10", "rustls 0.18.1", "serde 1.0.116", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.24", "tokio-rustls 0.14.1", "tokio-tls", "url", @@ -2766,7 +2774,7 @@ dependencies = [ "serde 1.0.116", "serde_json", "sha2 0.8.2", - "tokio", + "tokio 0.2.24", "xml-rs", ] @@ -2786,7 +2794,7 @@ dependencies = [ "serde 1.0.116", "serde_json", "shlex", - "tokio", + "tokio 0.2.24", "zeroize", ] @@ -2825,7 +2833,7 @@ dependencies = [ "serde 1.0.116", "sha2 0.8.2", "time 0.2.22", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -3508,9 +3516,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" +checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" dependencies = [ "bytes", "fnv", @@ -3522,18 +3530,28 @@ dependencies = [ "mio", "mio-named-pipes", "mio-uds", - "pin-project-lite", + "pin-project-lite 0.1.10", "signal-hook-registry", "slab", "tokio-macros", "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dae83881bc9b0403dd5b44ea9deed3e939856cc8722d5be37f0d6e5c6d53dd" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.9", +] + [[package]] name = "tokio-macros" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.7", @@ -3548,7 +3566,7 @@ checksum = "3068d891551949b37681724d6b73666787cc63fa8e255c812a41d2513aff9775" dependencies = [ "futures-core", "rustls 0.16.0", - "tokio", + "tokio 0.2.24", "webpki", ] @@ -3560,7 +3578,7 @@ checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" dependencies = [ "futures-core", "rustls 0.17.0", - "tokio", + "tokio 0.2.24", "webpki", ] @@ -3572,7 +3590,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls 0.18.1", - "tokio", + "tokio 0.2.24", "webpki", ] @@ -3583,7 +3601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -3596,8 +3614,8 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite", - "tokio", + "pin-project-lite 0.1.10", + "tokio 0.2.24", ] [[package]] @@ -3611,8 +3629,8 @@ dependencies = [ "futures-io", "futures-sink", "log", - "pin-project-lite", - "tokio", + "pin-project-lite 0.1.10", + "tokio 0.2.24", ] [[package]] @@ -3647,7 +3665,7 @@ checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" dependencies = [ "cfg-if", "log", - "pin-project-lite", + "pin-project-lite 0.1.10", "tracing-attributes", "tracing-core", ] @@ -3747,7 +3765,7 @@ dependencies = [ "rand", "smallvec", "socket2", - "tokio", + "tokio 0.2.24", "url", ] @@ -3767,7 +3785,7 @@ dependencies = [ "rand", "smallvec", "thiserror", - "tokio", + "tokio 0.2.24", "url", ] @@ -3786,7 +3804,7 @@ dependencies = [ "lru-cache", "resolv-conf", "smallvec", - "tokio", + "tokio 0.2.24", "trust-dns-proto 0.18.0-alpha.2", ] @@ -3806,7 +3824,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", + "tokio 0.2.24", "trust-dns-proto 0.19.5", ] diff --git a/rbac/Cargo.toml b/rbac/Cargo.toml index 21985ab..b3181fe 100644 --- a/rbac/Cargo.toml +++ b/rbac/Cargo.toml @@ -16,7 +16,7 @@ glob = "0.3" # Async futures = "0.3" -tokio = { version = "0.2", features = ["sync"] } +tokio = { version = "1.8", features = ["sync"] } actix-rt = "1.1" # Serde diff --git a/server/Cargo.toml b/server/Cargo.toml index 91e2cf8..d437073 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -52,7 +52,7 @@ validator_derive = "0.10" async-trait = "0.1.30" chrono = { version = "0.4", features = ["serde"] } futures = "0.3" -tokio = { version = "0.2", features = ["sync"] } +tokio = { version = "1.8", features = ["sync"] } # Security rustls = "0.18"