From 57e2b4f7145f2dfbbea06dd62c076c7be4de053c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Oct 2022 12:20:47 +0000 Subject: [PATCH] Bump tokio from 0.2.25 to 1.8.4 Bumps [tokio](https://github.com/tokio-rs/tokio) from 0.2.25 to 1.8.4. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-0.2.25...tokio-1.8.4) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 119 +++++++++++++++++++++++++++++++-------------- api/Cargo.toml | 2 +- servers/Cargo.toml | 2 +- 3 files changed, 85 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 43149d3cc..7aba7dab9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1006,7 +1006,7 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", - "tokio", + "tokio 1.8.4", "tokio-rustls", "url", ] @@ -1177,7 +1177,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "tokio", + "tokio 1.8.4", "tokio-util 0.2.0", "walkdir", ] @@ -1215,7 +1215,7 @@ dependencies = [ "lazy_static", "log", "log4rs", - "parking_lot", + "parking_lot 0.10.2", "rand 0.6.5", "serde", "serde_derive", @@ -1238,7 +1238,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util 0.3.1", "tracing", "tracing-futures", @@ -1350,7 +1350,7 @@ dependencies = [ "itoa 0.4.8", "pin-project", "socket2", - "tokio", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -1369,7 +1369,7 @@ dependencies = [ "log", "rustls", "rustls-native-certs", - "tokio", + "tokio 0.2.25", "tokio-rustls", "webpki", ] @@ -1382,7 +1382,7 @@ checksum = "0d1f9b0b8258e3ef8f45928021d3ef14096c2b93b99e4b8cfcabf1f58ec84b0a" dependencies = [ "bytes 0.5.6", "hyper", - "tokio", + "tokio 0.2.25", "tokio-io-timeout", ] @@ -1605,6 +1605,16 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg 1.1.0", + "scopeguard", +] + [[package]] name = "log" version = "0.4.17" @@ -1635,7 +1645,7 @@ dependencies = [ "libc", "log", "log-mdc", - "parking_lot", + "parking_lot 0.10.2", "serde", "serde-value", "serde_derive", @@ -1706,28 +1716,18 @@ dependencies = [ ] [[package]] -name = "mio-named-pipes" -version = "0.1.7" +name = "mio" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ + "libc", "log", - "mio", "miow 0.3.7", + "ntapi", "winapi 0.3.9", ] -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio", -] - [[package]] name = "miow" version = "0.2.2" @@ -1799,6 +1799,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num" version = "0.2.1" @@ -2007,8 +2016,19 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" dependencies = [ - "lock_api", - "parking_lot_core", + "lock_api 0.3.4", + "parking_lot_core 0.7.2", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api 0.4.9", + "parking_lot_core 0.8.5", ] [[package]] @@ -2025,6 +2045,20 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi 0.3.9", +] + [[package]] name = "password-hash" version = "0.2.3" @@ -2823,15 +2857,28 @@ dependencies = [ "futures-core", "iovec", "lazy_static", + "memchr", + "mio 0.6.23", + "pin-project-lite 0.1.12", + "slab", +] + +[[package]] +name = "tokio" +version = "1.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dae83881bc9b0403dd5b44ea9deed3e939856cc8722d5be37f0d6e5c6d53dd" +dependencies = [ + "autocfg 1.1.0", + "bytes 1.2.1", "libc", "memchr", - "mio", - "mio-named-pipes", - "mio-uds", + "mio 0.7.14", "num_cpus", - "pin-project-lite 0.1.12", + "once_cell", + "parking_lot 0.11.2", + "pin-project-lite 0.2.9", "signal-hook-registry", - "slab", "tokio-macros", "winapi 0.3.9", ] @@ -2843,14 +2890,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9390a43272c8a6ac912ed1d1e2b6abeafd5047e05530a2fa304deee041a06215" dependencies = [ "bytes 0.5.6", - "tokio", + "tokio 0.2.25", ] [[package]] name = "tokio-macros" -version = "0.2.6" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", @@ -2865,7 +2912,7 @@ checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -2880,7 +2927,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -2894,7 +2941,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", ] [[package]] diff --git a/api/Cargo.toml b/api/Cargo.toml index 3dc4879ce..a1487e495 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -20,7 +20,7 @@ serde_derive = "1" serde_json = "1" thiserror = "1" log = "0.4" -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "1.8", features = ["full"] } tokio-rustls = "0.13" http = "0.2" hyper-rustls = "0.20" diff --git a/servers/Cargo.toml b/servers/Cargo.toml index df18190c5..61ad541bd 100644 --- a/servers/Cargo.toml +++ b/servers/Cargo.toml @@ -22,7 +22,7 @@ log = "0.4" serde_derive = "1" serde_json = "1" chrono = "0.4.11" -tokio = {version = "0.2", features = ["full"] } +tokio = {version = "1.8", features = ["full"] } tokio-util = { version = "0.2", features = ["codec"] } walkdir = "2.3.1"