From 881393576d46c2f2109b83dc7397e110a85572f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 4 Feb 2023 02:25:27 +0000 Subject: [PATCH] Bump tokio from 1.4.0 to 1.18.5 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.4.0 to 1.18.5. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.4.0...tokio-1.18.5) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 117 +++++++++++++++++++++++++++++----------- Cargo.toml | 2 +- minion-cli/Cargo.toml | 2 +- minion-ffi/Cargo.toml | 2 +- minion-tests/Cargo.toml | 2 +- 5 files changed, 90 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5cc92e18..76c07a59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -267,7 +267,7 @@ checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] @@ -339,9 +339,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.91" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "lock_api" @@ -449,24 +449,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.11" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -481,15 +471,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - [[package]] name = "num-integer" version = "0.1.44" @@ -809,6 +790,16 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "strsim" version = "0.10.0" @@ -899,22 +890,23 @@ dependencies = [ [[package]] name = "tokio" -version = "1.4.0" +version = "1.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" +checksum = "0e050c618355082ae5a89ec63bbf897225d5ffe84c7c4e036874e4d185a5044e" dependencies = [ - "autocfg", "libc", "mio", "pin-project-lite", + "socket2", "tokio-macros", + "winapi", ] [[package]] name = "tokio-macros" -version = "1.1.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -1041,6 +1033,12 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "winapi" version = "0.3.9" @@ -1071,3 +1069,60 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/Cargo.toml b/Cargo.toml index bc37d5cb..c9bc4e4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ thiserror = "1.0.24" anyhow = "1.0.39" once_cell = "1.7.2" futures-util = "0.3.13" -tokio = { version = "1.4.0", features = ["net", "time", "rt"] } +tokio = { version = "1.18.5", features = ["net", "time", "rt"] } tracing = "0.1.25" itoa = "0.4.7" parking_lot = "0.11.1" diff --git a/minion-cli/Cargo.toml b/minion-cli/Cargo.toml index 0c5f7c6f..9aa825c0 100644 --- a/minion-cli/Cargo.toml +++ b/minion-cli/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] minion = {path = ".."} libc = "0.2.91" -tokio = { version = "1.4.0", features = ["macros", "rt"] } +tokio = { version = "1.18.5", features = ["macros", "rt"] } tracing-subscriber = "0.2.17" clap = "3.0.0-beta.2" diff --git a/minion-ffi/Cargo.toml b/minion-ffi/Cargo.toml index 0c41e8ae..ee7a6c94 100644 --- a/minion-ffi/Cargo.toml +++ b/minion-ffi/Cargo.toml @@ -9,7 +9,7 @@ crate-type = ["cdylib", "staticlib"] [dependencies] minion = {path = ".."} -tokio = { version = "1.4.0", features = ["rt", "time"] } +tokio = { version = "1.18.5", features = ["rt", "time"] } [build-dependencies] cbindgen = { version = "0.18.0", default-features = false } diff --git a/minion-tests/Cargo.toml b/minion-tests/Cargo.toml index 68e1ce05..318052f0 100644 --- a/minion-tests/Cargo.toml +++ b/minion-tests/Cargo.toml @@ -10,6 +10,6 @@ minion = {path = "..", features = ["internal_dev"]} clap = "3.0.0-beta.2" nix = "0.20.0" tempfile = "3.2.0" -tokio = { version = "1.4.0", features = ["macros", "rt"] } +tokio = { version = "1.18.5", features = ["macros", "rt"] } tracing-subscriber = "0.2.17" tracing = "0.1.25"