diff --git a/Cargo.lock b/Cargo.lock index ee1476918575..7f9943bb978a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -301,7 +301,7 @@ dependencies = [ "storage-interface", "structopt 0.3.21", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.6.4", "toml", ] @@ -3267,7 +3267,7 @@ dependencies = [ "indexmap", "slab", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] @@ -4530,7 +4530,7 @@ dependencies = [ "thiserror", "tokio 0.2.24", "tokio-retry", - "tokio-util", + "tokio-util 0.6.4", ] [[package]] @@ -6424,7 +6424,7 @@ dependencies = [ "network-builder", "rand 0.7.3", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.6.4", ] [[package]] @@ -7160,13 +7160,27 @@ checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ "bytes 0.5.6", "futures-core", - "futures-io", "futures-sink", "log", "pin-project-lite 0.1.11", "tokio 0.2.24", ] +[[package]] +name = "tokio-util" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec31e5cc6b46e653cf57762f36f71d5e6386391d88a72fd6db4508f8f676fb29" +dependencies = [ + "bytes 1.0.0", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite 0.2.0", + "tokio 1.0.1", +] + [[package]] name = "toml" version = "0.5.8" diff --git a/network/Cargo.toml b/network/Cargo.toml index fa2f79a37739..201261c6fdf5 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -26,7 +26,7 @@ serde_bytes = "0.11.5" thiserror = "1.0.23" tokio = { version = "0.2.22", features = ["full"] } tokio-retry = "0.2.0" -tokio-util = { version = "0.3.1", features = ["codec"] } +tokio-util = { version = "0.6.4", features = ["codec"] } bitvec = { path = "../common/bitvec", version = "0.1.0", package = "diem-bitvec" } channel = { path = "../common/channel", version = "0.1.0" } diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml index 975d883228e5..bcd7c89ae081 100644 --- a/network/socket-bench-server/Cargo.toml +++ b/network/socket-bench-server/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] futures = "0.3.9" tokio = { version = "0.2.22", features = ["full"] } -tokio-util = { version = "0.3.1", features = ["codec"] } +tokio-util = { version = "0.6.4", features = ["codec"] } diem-crypto = { path = "../../crypto/crypto" } diem-config = { path = "../../config" } diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 396999a8e621..e9bbe9f743a1 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -27,7 +27,7 @@ serde_json = "1.0.61" structopt = "0.3.21" toml = "0.5.8" tokio = { version = "0.2.22", features = ["full"] } -tokio-util = { version = "0.3.1", features = ["compat"] } +tokio-util = { version = "0.6.4", features = ["compat"] } executor = { path = "../../../execution/executor", version = "0.1.0" } executor-test-helpers = { path = "../../../execution/executor-test-helpers", version = "0.1.0", optional = true }