diff --git a/Cargo.lock b/Cargo.lock index d7cb3879..5aab546f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,7 +12,7 @@ dependencies = [ "futures-sink", "log", "pin-project 0.4.27", - "tokio", + "tokio 0.2.24", "tokio-util", ] @@ -129,7 +129,7 @@ dependencies = [ "futures-channel", "futures-util", "smallvec", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -427,7 +427,7 @@ dependencies = [ "serde", "serde_json", "structopt", - "tokio", + "tokio 1.4.0", "tracing", "tracing-futures", "url", @@ -497,7 +497,7 @@ dependencies = [ "httparse", "lazy_static", "log", - "pin-project-lite", + "pin-project-lite 0.1.11", ] [[package]] @@ -550,7 +550,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite", + "pin-project-lite 0.1.11", "pin-utils", "slab", "wasm-bindgen-futures", @@ -1400,7 +1400,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite", + "pin-project-lite 0.1.11", "waker-fn", ] @@ -1578,7 +1578,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.24", "tokio-util", "tracing", "tracing-futures", @@ -1674,7 +1674,7 @@ dependencies = [ "futures-lite", "http", "infer", - "pin-project-lite", + "pin-project-lite 0.1.11", "rand", "serde", "serde_json", @@ -1728,7 +1728,7 @@ dependencies = [ "itoa", "pin-project 1.0.1", "socket2", - "tokio", + "tokio 0.2.24", "tower-service", "tracing", "want", @@ -1743,7 +1743,7 @@ dependencies = [ "bytes", "hyper", "native-tls", - "tokio", + "tokio 0.2.24", "tokio-tls", ] @@ -2379,6 +2379,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" +[[package]] +name = "pin-project-lite" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" + [[package]] name = "pin-utils" version = "0.1.0" @@ -2653,11 +2659,11 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.1.11", "serde", "serde_json", "serde_urlencoded 0.6.1", - "tokio", + "tokio 0.2.24", "tokio-tls", "url", "wasm-bindgen", @@ -3279,9 +3285,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", @@ -3292,18 +3298,28 @@ dependencies = [ "memchr", "mio", "mio-uds", - "pin-project-lite", + "pin-project-lite 0.1.11", "signal-hook-registry", "slab", - "tokio-macros", "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.6", + "tokio-macros", +] + [[package]] name = "tokio-macros" -version = "0.2.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2", "quote", @@ -3317,7 +3333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -3330,8 +3346,8 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite", - "tokio", + "pin-project-lite 0.1.11", + "tokio 0.2.24", ] [[package]] @@ -3348,7 +3364,7 @@ checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" dependencies = [ "cfg-if 0.1.10", "log", - "pin-project-lite", + "pin-project-lite 0.1.11", "tracing-attributes", "tracing-core", ] @@ -3487,7 +3503,7 @@ dependencies = [ "rand", "smallvec", "thiserror", - "tokio", + "tokio 0.2.24", "url", ] @@ -3507,7 +3523,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", + "tokio 0.2.24", "trust-dns-proto", ] diff --git a/stargate/crates/stargate-lib/Cargo.toml b/stargate/crates/stargate-lib/Cargo.toml index 3b315c99..ac76c972 100644 --- a/stargate/crates/stargate-lib/Cargo.toml +++ b/stargate/crates/stargate-lib/Cargo.toml @@ -27,5 +27,5 @@ tracing-futures = "0.2.4" url = "2.1.1" [dev-dependencies] -tokio = { version = "0.2.2", features = ["macros"]} +tokio = { version = "1.4.0", features = ["macros"]} wiremock = "0.3"