From b1155ad1ceaf14c7611bdbf713758ee6a5e5f9a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 4 Feb 2023 01:03:42 +0000 Subject: [PATCH] Bump tokio from 0.2.25 to 1.18.5 Bumps [tokio](https://github.com/tokio-rs/tokio) from 0.2.25 to 1.18.5. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-0.2.25...tokio-1.18.5) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 133 ++++++++++++++++++++++++++++----------------- api/Cargo.toml | 2 +- servers/Cargo.toml | 2 +- 3 files changed, 86 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 43149d3cc..52d40753d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1006,7 +1006,7 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", - "tokio", + "tokio 1.18.5", "tokio-rustls", "url", ] @@ -1177,7 +1177,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "tokio", + "tokio 1.18.5", "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", @@ -1349,8 +1349,8 @@ dependencies = [ "httpdate", "itoa 0.4.8", "pin-project", - "socket2", - "tokio", + "socket2 0.3.19", + "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", @@ -1699,33 +1709,22 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.2", + "miow", "net2", "slab", "winapi 0.2.8", ] [[package]] -name = "mio-named-pipes" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" -dependencies = [ - "log", - "mio", - "miow 0.3.7", - "winapi 0.3.9", -] - -[[package]] -name = "mio-uds" -version = "0.6.8" +name = "mio" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ - "iovec", "libc", - "mio", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.42.0", ] [[package]] @@ -1740,15 +1739,6 @@ dependencies = [ "ws2_32-sys", ] -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "ncurses" version = "5.101.0" @@ -2007,8 +1997,18 @@ 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.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api 0.4.9", + "parking_lot_core 0.9.6", ] [[package]] @@ -2025,6 +2025,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "windows-sys 0.42.0", +] + [[package]] name = "password-hash" version = "0.2.3" @@ -2633,6 +2646,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "spin" version = "0.5.2" @@ -2823,15 +2846,27 @@ dependencies = [ "futures-core", "iovec", "lazy_static", + "memchr", + "mio 0.6.23", + "pin-project-lite 0.1.12", + "slab", +] + +[[package]] +name = "tokio" +version = "1.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e050c618355082ae5a89ec63bbf897225d5ffe84c7c4e036874e4d185a5044e" +dependencies = [ + "bytes 1.2.1", "libc", "memchr", - "mio", - "mio-named-pipes", - "mio-uds", + "mio 0.8.5", "num_cpus", - "pin-project-lite 0.1.12", + "parking_lot 0.12.1", + "pin-project-lite 0.2.9", "signal-hook-registry", - "slab", + "socket2 0.4.7", "tokio-macros", "winapi 0.3.9", ] @@ -2843,14 +2878,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.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", @@ -2865,7 +2900,7 @@ checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -2880,7 +2915,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -2894,7 +2929,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..35bdde39f 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.18", 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..b607a8d15 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.18", features = ["full"] } tokio-util = { version = "0.2", features = ["codec"] } walkdir = "2.3.1"