From f3d8a7b3077892e55f2665b596df1d5d39b7729b Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Thu, 15 Oct 2020 19:53:14 +0200 Subject: [PATCH] Bump tokio from 0.2 to 0.3 --- Cargo.lock | 129 +++++++++++++++++++++++++--------------- api/Cargo.toml | 2 +- book/Cargo.toml | 2 +- borrow/Cargo.toml | 2 +- identity/Cargo.toml | 2 +- notification/Cargo.toml | 2 +- 6 files changed, 86 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b94a745..2419fa78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,7 +32,7 @@ dependencies = [ "serde", "serde_json", "tarpc", - "tokio", + "tokio 0.3.1", "tokio-serde", "warp", ] @@ -122,7 +122,7 @@ dependencies = [ "once_cell", "serde", "tarpc", - "tokio", + "tokio 0.3.1", "tokio-serde", ] @@ -140,7 +140,7 @@ dependencies = [ "once_cell", "serde", "tarpc", - "tokio", + "tokio 0.3.1", "tokio-serde", ] @@ -178,6 +178,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16" + [[package]] name = "cc" version = "1.0.61" @@ -522,7 +528,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", @@ -530,7 +536,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.22", "tokio-util", "tracing", ] @@ -549,7 +555,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f" dependencies = [ "base64", "bitflags", - "bytes", + "bytes 0.5.6", "headers-core", "http", "mime", @@ -581,7 +587,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", ] @@ -592,7 +598,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] @@ -623,7 +629,7 @@ version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", @@ -635,7 +641,7 @@ dependencies = [ "itoa", "pin-project", "socket2", - "tokio", + "tokio 0.2.22", "tower-service", "tracing", "want", @@ -647,10 +653,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", ] @@ -671,7 +677,7 @@ dependencies = [ "serde", "serde_json", "tarpc", - "tokio", + "tokio 0.3.1", "tokio-serde", ] @@ -702,7 +708,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] @@ -840,14 +846,15 @@ dependencies = [ ] [[package]] -name = "mio-named-pipes" -version = "0.1.7" +name = "mio" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +checksum = "f8f1c83949125de4a582aa2da15ae6324d91cf6a58a70ea407643941ff98f558" dependencies = [ + "libc", "log", - "mio", "miow 0.3.5", + "ntapi", "winapi 0.3.9", ] @@ -859,7 +866,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.22", ] [[package]] @@ -945,10 +952,19 @@ dependencies = [ "once_cell", "serde", "tarpc", - "tokio", + "tokio 0.3.1", "tokio-serde", ] +[[package]] +name = "ntapi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-bigint" version = "0.2.6" @@ -1105,9 +1121,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e555d9e657502182ac97b539fb3dae8b79cda19e3e4f8ffb5e8de4f18df93c95" +checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-utils" @@ -1117,9 +1133,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "ppv-lite86" @@ -1347,9 +1363,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f45b719a674bf4b828ff318906d6c133264c793eff7a41e30074a45b5099e2" +checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" dependencies = [ "aho-corasick", "memchr", @@ -1359,9 +1375,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.19" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17be88d9eaa858870aa5e48cc406c206e4600e983fc4f06bbe5750d93d09761" +checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" [[package]] name = "remove_dir_all" @@ -1455,18 +1471,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" +checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" +checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ "proc-macro2", "quote", @@ -1580,9 +1596,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "1.0.44" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd" +checksum = "5ad5de3220ea04da322618ded2c42233d02baca219d6f160a3e9c87cda16c942" dependencies = [ "proc-macro2", "quote", @@ -1605,7 +1621,7 @@ dependencies = [ "serde", "static_assertions", "tarpc-plugins", - "tokio", + "tokio 0.2.22", "tokio-serde", "tokio-util", ] @@ -1676,17 +1692,34 @@ 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", "lazy_static", "libc", "memchr", - "mio", - "mio-named-pipes", + "mio 0.6.22", "mio-uds", + "pin-project-lite", + "slab", +] + +[[package]] +name = "tokio" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1911a203c5c240fd237e23a42e48846475f3d3b1e1dad3f17e6cc17a775b707c" +dependencies = [ + "bytes 0.6.0", + "fnv", + "futures-core", + "lazy_static", + "libc", + "memchr", + "mio 0.7.4", "num_cpus", + "parking_lot", "pin-project-lite", "signal-hook-registry", "slab", @@ -1696,9 +1729,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "d48caa7b66c7a6ec943edf78d21a594fbeb24e536c781da67d5c32edec54103f" dependencies = [ "proc-macro2", "quote", @@ -1711,7 +1744,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebdd897b01021779294eb09bb3b52b6e11b0747f9f7e333a84bef532b656de99" dependencies = [ - "bytes", + "bytes 0.5.6", "derivative", "futures", "pin-project", @@ -1726,7 +1759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1738,7 +1771,7 @@ dependencies = [ "futures-util", "log", "pin-project", - "tokio", + "tokio 0.2.22", "tungstenite", ] @@ -1748,12 +1781,12 @@ 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-sink", "log", "pin-project-lite", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -1807,7 +1840,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" dependencies = [ "base64", "byteorder", - "bytes", + "bytes 0.5.6", "http", "httparse", "input_buffer", @@ -1923,7 +1956,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407" dependencies = [ - "bytes", + "bytes 0.5.6", "futures", "headers", "http", @@ -1937,7 +1970,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.22", "tokio-tungstenite", "tower-service", "tracing", diff --git a/api/Cargo.toml b/api/Cargo.toml index cd5f0eb6..079f6bca 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -18,6 +18,6 @@ once_cell = "1.4" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tarpc = { version = "0.22", features = ["full"] } -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.3", features = ["full"] } tokio-serde = { version = "0.6", features = ["json"] } warp = "0.2" diff --git a/book/Cargo.toml b/book/Cargo.toml index 038c5ebe..f5ed73f0 100644 --- a/book/Cargo.toml +++ b/book/Cargo.toml @@ -15,5 +15,5 @@ log = "0.4" once_cell = "1.4" serde = { version = "1.0", features = ["derive"] } tarpc = { version = "0.22", features = ["full"] } -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.3", features = ["full"] } tokio-serde = { version = "0.6", features = ["json"] } diff --git a/borrow/Cargo.toml b/borrow/Cargo.toml index e1276562..2ac6eaa8 100644 --- a/borrow/Cargo.toml +++ b/borrow/Cargo.toml @@ -15,5 +15,5 @@ log = "0.4" once_cell = "1.4" serde = { version = "1.0", features = ["derive"] } tarpc = { version = "0.22", features = ["full"] } -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.3", features = ["full"] } tokio-serde = { version = "0.6", features = ["json"] } diff --git a/identity/Cargo.toml b/identity/Cargo.toml index 3a0ffaeb..2d9dbe19 100644 --- a/identity/Cargo.toml +++ b/identity/Cargo.toml @@ -22,5 +22,5 @@ once_cell = "1.4" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tarpc = { version = "0.22", features = ["full"] } -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.3", features = ["full"] } tokio-serde = { version = "0.6", features = ["json"] } diff --git a/notification/Cargo.toml b/notification/Cargo.toml index 32b488b4..e011bcc0 100644 --- a/notification/Cargo.toml +++ b/notification/Cargo.toml @@ -15,5 +15,5 @@ log = "0.4" once_cell = "1.4" serde = { version = "1.0", features = ["derive"] } tarpc = { version = "0.22", features = ["full"] } -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.3", features = ["full"] } tokio-serde = { version = "0.6", features = ["json"] }