diff --git a/Cargo.lock b/Cargo.lock index c30967c..630244f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,7 +9,7 @@ dependencies = [ "actix-rt", "actix_derive", "bitflags", - "bytes", + "bytes 0.5.6", "crossbeam-channel 0.4.4", "derive_more", "futures-channel", @@ -19,7 +19,7 @@ dependencies = [ "parking_lot", "pin-project", "smallvec", - "tokio", + "tokio 0.2.22", "tokio-util 0.3.1", "trust-dns-proto 0.19.5", "trust-dns-resolver 0.19.5", @@ -32,11 +32,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380" dependencies = [ "bitflags", - "bytes", + "bytes 0.5.6", "futures-core", "futures-sink", "log", - "tokio", + "tokio 0.2.22", "tokio-util 0.2.0", ] @@ -78,7 +78,7 @@ dependencies = [ "base64 0.11.0", "bitflags", "brotli2", - "bytes", + "bytes 0.5.6", "chrono", "copyless", "derive_more", @@ -131,7 +131,7 @@ dependencies = [ "futures-channel", "futures-util", "smallvec", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -189,7 +189,7 @@ dependencies = [ "actix-rt", "actix-service", "bitflags", - "bytes", + "bytes 0.5.6", "either", "futures", "log", @@ -286,7 +286,7 @@ dependencies = [ "actix-rt", "actix-service", "base64 0.11.0", - "bytes", + "bytes 0.5.6", "derive_more", "futures-core", "log", @@ -378,6 +378,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + [[package]] name = "cc" version = "1.0.59" @@ -753,7 +759,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -761,7 +767,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.22", "tokio-util 0.3.1", "tracing", ] @@ -807,7 +813,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "itoa", ] @@ -818,7 +824,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] @@ -834,7 +840,7 @@ version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", @@ -846,7 +852,7 @@ dependencies = [ "pin-project", "socket2", "time", - "tokio", + "tokio 0.2.22", "tower-service", "tracing", "want", @@ -858,10 +864,10 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ - "bytes", + "bytes 0.5.6", "hyper", "native-tls", - "tokio", + "tokio 0.2.22", "tokio-tls", ] @@ -1269,6 +1275,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715" +[[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" @@ -1404,7 +1416,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" dependencies = [ "base64 0.12.3", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", @@ -1420,11 +1432,11 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.1.7", "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.22", "tokio-tls", "url", "wasm-bindgen", @@ -1734,7 +1746,7 @@ version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", @@ -1745,12 +1757,22 @@ dependencies = [ "mio-named-pipes", "mio-uds", "num_cpus", - "pin-project-lite", + "pin-project-lite 0.1.7", "signal-hook-registry", "slab", "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.6", +] + [[package]] name = "tokio-rustls" version = "0.12.3" @@ -1759,7 +1781,7 @@ checksum = "3068d891551949b37681724d6b73666787cc63fa8e255c812a41d2513aff9775" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.22", "webpki", ] @@ -1770,7 +1792,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1779,12 +1801,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-sink", "log", - "pin-project-lite", - "tokio", + "pin-project-lite 0.1.7", + "tokio 0.2.22", ] [[package]] @@ -1793,13 +1815,27 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-io", "futures-sink", "log", - "pin-project-lite", - "tokio", + "pin-project-lite 0.1.7", + "tokio 0.2.22", +] + +[[package]] +name = "tokio-util" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec31e5cc6b46e653cf57762f36f71d5e6386391d88a72fd6db4508f8f676fb29" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.2.6", + "tokio 1.3.0", ] [[package]] @@ -1844,7 +1880,7 @@ dependencies = [ "rand", "smallvec", "socket2", - "tokio", + "tokio 0.2.22", "url", ] @@ -1864,7 +1900,7 @@ dependencies = [ "rand", "smallvec", "thiserror", - "tokio", + "tokio 0.2.22", "url", ] @@ -1883,7 +1919,7 @@ dependencies = [ "lru-cache", "resolv-conf", "smallvec", - "tokio", + "tokio 0.2.22", "trust-dns-proto 0.18.0-alpha.2", ] @@ -1903,7 +1939,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", + "tokio 0.2.22", "trust-dns-proto 0.19.5", ] @@ -2101,7 +2137,7 @@ dependencies = [ "actix-codec", "actix-rt", "awc", - "bytes", + "bytes 0.5.6", "clap", "crossbeam-channel 0.5.0", "futures", @@ -2109,8 +2145,8 @@ dependencies = [ "rustls", "serde", "serde_json", - "tokio", - "tokio-util 0.3.1", + "tokio 0.2.22", + "tokio-util 0.6.4", "webpki-roots 0.19.0", ] diff --git a/Cargo.toml b/Cargo.toml index ac02f8c..770024d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ futures = "0.3.5" bytes = "0.5.6" actix-rt = "1.1.1" tokio = { version = "0.2.22", features = ["process"] } -tokio-util = { version = "0.3.1", features = ["codec"] } +tokio-util = { version = "0.6.4", features = ["codec"] } rustls = "0.16" webpki-roots = "0.19.0" clap = "2.33.3"