From 5a532a1f1d6c9450beb1443b78c7e1b3c6b449f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Jan 2021 06:28:19 +0000
Subject: [PATCH] Bump tokio-util from 0.3.1 to 0.6.2

Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.3.1 to 0.6.2.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-0.3.1...tokio-util-0.6.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                             | 144 ++++++++++++++++++-------
 network/Cargo.toml                     |   2 +-
 network/socket-bench-server/Cargo.toml |   2 +-
 storage/backup/backup-cli/Cargo.toml   |   2 +-
 4 files changed, 107 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 56239f59258e..9afe6cb3c699 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -184,13 +184,34 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "flate2",
  "futures-core",
  "memchr",
  "pin-project-lite 0.2.0",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.8",
+ "syn 1.0.55",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.42"
@@ -249,7 +270,7 @@ dependencies = [
  "backup-service",
  "bcs",
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "diem-config",
  "diem-crypto",
  "diem-infallible",
@@ -280,7 +301,7 @@ dependencies = [
  "storage-interface",
  "structopt 0.3.21",
  "tokio 0.2.22",
- "tokio-util",
+ "tokio-util 0.6.2",
  "toml",
 ]
 
@@ -290,7 +311,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bcs",
- "bytes",
+ "bytes 0.5.6",
  "diem-config",
  "diem-crypto",
  "diem-logger",
@@ -587,6 +608,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+
 [[package]]
 name = "c_linked_list"
 version = "1.1.1"
@@ -912,7 +939,7 @@ dependencies = [
  "async-trait",
  "bcs",
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "channel",
  "consensus-types",
  "diem-config",
@@ -1278,7 +1305,7 @@ name = "debug-interface"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bytes",
+ "bytes 0.5.6",
  "diem-logger",
  "diem-metrics",
  "diem-workspace-hack",
@@ -1358,7 +1385,7 @@ dependencies = [
  "bcs",
  "bitvec",
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "criterion",
  "curve25519-dalek 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "curve25519-dalek 3.0.0 (git+https://github.com/novifinancial/curve25519-dalek.git?branch=fiat3)",
@@ -2170,7 +2197,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bcs",
- "bytes",
+ "bytes 0.5.6",
  "chrono",
  "diem-crypto",
  "diem-crypto-derive",
@@ -2283,7 +2310,7 @@ name = "diem-workspace-hack"
 version = "0.1.0"
 dependencies = [
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "cc",
  "chrono",
  "itertools 0.9.0",
@@ -3216,7 +3243,7 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -3225,7 +3252,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio 0.2.22",
- "tokio-util",
+ "tokio-util 0.3.1",
  "tracing",
  "tracing-futures",
 ]
@@ -3264,7 +3291,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f"
 dependencies = [
  "base64 0.12.3",
  "bitflags",
- "bytes",
+ "bytes 0.5.6",
  "headers-core",
  "http",
  "mime",
@@ -3352,7 +3379,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "fnv",
  "itoa",
 ]
@@ -3363,7 +3390,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "http",
 ]
 
@@ -3400,7 +3427,7 @@ version = "0.13.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -3424,7 +3451,7 @@ 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 0.2.22",
@@ -3491,7 +3518,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
 ]
 
 [[package]]
@@ -3668,7 +3695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcaa8ea719de24e21fe6fddb2ea996ca4e312d467c119f827551c4768d97dc5c"
 dependencies = [
  "base64 0.13.0",
- "bytes",
+ "bytes 0.5.6",
  "chrono",
  "serde",
  "serde-value",
@@ -3699,7 +3726,7 @@ checksum = "6585da8efec1a3b5df0fb12b357e2f3921cd7436a6d10f1ea06377d4cbd85032"
 dependencies = [
  "Inflector",
  "base64 0.12.3",
- "bytes",
+ "bytes 0.5.6",
  "chrono",
  "dirs-next",
  "either",
@@ -3924,7 +3951,7 @@ dependencies = [
 name = "memsocket"
 version = "0.1.0"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "diem-infallible",
  "diem-workspace-hack",
  "futures 0.3.8",
@@ -4398,7 +4425,7 @@ dependencies = [
 name = "netcore"
 version = "0.1.0"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "diem-logger",
  "diem-network-address",
  "diem-types",
@@ -4418,7 +4445,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bcs",
- "bytes",
+ "bytes 0.5.6",
  "channel",
  "criterion",
  "diem-bitvec",
@@ -4453,7 +4480,7 @@ dependencies = [
  "thiserror",
  "tokio 0.2.22",
  "tokio-retry",
- "tokio-util",
+ "tokio-util 0.6.2",
 ]
 
 [[package]]
@@ -5126,7 +5153,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "prost-derive",
 ]
 
@@ -5136,7 +5163,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "heck",
  "itertools 0.8.2",
  "log",
@@ -5167,7 +5194,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "prost",
 ]
 
@@ -5548,7 +5575,7 @@ checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"
 dependencies = [
  "async-compression",
  "base64 0.13.0",
- "bytes",
+ "bytes 0.5.6",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -5625,7 +5652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7af1c42491edaa3b2582c6f3a0221f5ef4ed7a02c71cf1f614bb12877e1d44dd"
 dependencies = [
  "async-trait",
- "bytes",
+ "bytes 0.5.6",
  "futures 0.3.8",
  "rusoto_core",
  "serde_urlencoded 0.6.1",
@@ -5640,7 +5667,7 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7"
 dependencies = [
  "async-trait",
  "base64 0.12.3",
- "bytes",
+ "bytes 0.5.6",
  "crc32fast",
  "futures 0.3.8",
  "http",
@@ -5687,7 +5714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1146e37a7c1df56471ea67825fe09bbbd37984b5f6e201d8b2e0be4ee15643d8"
 dependencies = [
  "async-trait",
- "bytes",
+ "bytes 0.5.6",
  "futures 0.3.8",
  "rusoto_core",
  "xml-rs",
@@ -5700,7 +5727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97a740a88dde8ded81b6f2cff9cd5e054a5a2e38a38397260f7acdd2c85d17dd"
 dependencies = [
  "base64 0.12.3",
- "bytes",
+ "bytes 0.5.6",
  "futures 0.3.8",
  "hex",
  "hmac 0.8.1",
@@ -5725,7 +5752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3815b8c0fc1c50caf9e87603f23daadfedb18d854de287b361c69f68dc9d49e0"
 dependencies = [
  "async-trait",
- "bytes",
+ "bytes 0.5.6",
  "chrono",
  "futures 0.3.8",
  "rusoto_core",
@@ -6345,7 +6372,7 @@ dependencies = [
  "network-builder",
  "rand 0.7.3",
  "tokio 0.2.22",
- "tokio-util",
+ "tokio-util 0.6.2",
 ]
 
 [[package]]
@@ -6405,7 +6432,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bcs",
- "bytes",
+ "bytes 0.5.6",
  "channel",
  "compiled-stdlib",
  "diem-config",
@@ -6979,7 +7006,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",
@@ -7009,6 +7036,16 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "tokio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca04cec6ff2474c638057b65798f60ac183e5e79d3448bb7163d36a39cff6ec"
+dependencies = [
+ "autocfg 1.0.1",
+ "pin-project-lite 0.2.0",
+]
+
 [[package]]
 name = "tokio-executor"
 version = "0.1.10"
@@ -7041,13 +7078,24 @@ dependencies = [
  "tokio-timer",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76066865172052eb8796c686f0b441a93df8b08d40a950b062ffb9a426f00edd"
+dependencies = [
+ "futures-core",
+ "pin-project-lite 0.2.0",
+ "tokio 1.0.2",
+]
+
 [[package]]
 name = "tokio-test"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edc5a2b13a713b9134debc9aa1265b0a1ccf6a81fa05af2ba26e4aee56cdf1a"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "futures-core",
  "tokio 0.3.6",
 ]
@@ -7093,15 +7141,31 @@ 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 0.1.11",
  "tokio 0.2.22",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "feb971a26599ffd28066d387f109746df178eff14d5ea1e235015c5601967a4b"
+dependencies = [
+ "async-stream",
+ "bytes 1.0.1",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "log",
+ "pin-project-lite 0.2.0",
+ "tokio 1.0.2",
+ "tokio-stream",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.8"
@@ -7221,7 +7285,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23"
 dependencies = [
  "base64 0.12.3",
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "http",
  "httparse",
  "input_buffer",
@@ -7496,7 +7560,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "futures 0.3.8",
  "headers",
  "http",
diff --git a/network/Cargo.toml b/network/Cargo.toml
index 29b6e8894291..f5072fb73f94 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -26,7 +26,7 @@ serde_bytes = "0.11.5"
 thiserror = "1.0.22"
 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.2", 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 21e30f8edc60..4ca3ca6ab10e 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.8"
 tokio = { version = "0.2.22", features = ["full"] }
-tokio-util = { version = "0.3.1", features = ["codec"] }
+tokio-util = { version = "0.6.2", 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 8052425d1c83..d85b7dab6d02 100644
--- a/storage/backup/backup-cli/Cargo.toml
+++ b/storage/backup/backup-cli/Cargo.toml
@@ -27,7 +27,7 @@ serde_json = "1.0.60"
 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.2", features = ["compat"] }
 
 executor = { path = "../../../execution/executor", version = "0.1.0" }
 executor-test-helpers = { path = "../../../execution/executor-test-helpers", version = "0.1.0", optional = true }