From a87ca535fed9cb9e519fc5608e308be0defbd2d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Mar 2022 22:23:17 +0000
Subject: [PATCH] Bump tokio-util from 0.6.4 to 0.7.1

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

---
updated-dependencies:
- dependency-name: tokio-util
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                             | 49 ++++++++++++++++----------
 common/rate-limiter/Cargo.toml         |  2 +-
 common/workspace-hack/Cargo.toml       |  8 ++---
 network/Cargo.toml                     |  2 +-
 network/netcore/Cargo.toml             |  2 +-
 network/socket-bench-server/Cargo.toml |  2 +-
 storage/backup/backup-cli/Cargo.toml   |  2 +-
 7 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a8b97ff26f5f..3742da34f8b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -309,7 +309,7 @@ dependencies = [
  "structopt 0.3.21",
  "tokio",
  "tokio-stream",
- "tokio-util",
+ "tokio-util 0.7.1",
  "toml",
  "warp",
 ]
@@ -2058,7 +2058,7 @@ dependencies = [
  "futures",
  "pin-project",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.1",
 ]
 
 [[package]]
@@ -2421,7 +2421,7 @@ dependencies = [
  "syn 0.15.44",
  "syn 1.0.62",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.1",
  "toml",
  "tracing",
  "warp",
@@ -3344,7 +3344,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
  "tracing",
 ]
 
@@ -3863,7 +3863,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-native-tls",
- "tokio-util",
+ "tokio-util 0.6.9",
  "tower",
  "url",
 ]
@@ -4545,7 +4545,7 @@ dependencies = [
  "proxy",
  "serde",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.1",
  "url",
 ]
 
@@ -4593,7 +4593,7 @@ dependencies = [
  "tokio",
  "tokio-retry",
  "tokio-stream",
- "tokio-util",
+ "tokio-util 0.7.1",
 ]
 
 [[package]]
@@ -6603,7 +6603,7 @@ dependencies = [
  "network-builder",
  "rand 0.8.3",
  "tokio",
- "tokio-util",
+ "tokio-util 0.7.1",
 ]
 
 [[package]]
@@ -7191,11 +7191,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.3.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda"
+checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
 dependencies = [
- "autocfg 1.0.1",
  "bytes",
  "libc",
  "memchr",
@@ -7221,9 +7220,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.1.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.9",
@@ -7301,19 +7300,33 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.4"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec31e5cc6b46e653cf57762f36f71d5e6386391d88a72fd6db4508f8f676fb29"
+checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
 dependencies = [
  "bytes",
  "futures-core",
- "futures-io",
  "futures-sink",
  "log",
  "pin-project-lite",
  "tokio",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.8"
@@ -7333,7 +7346,7 @@ dependencies = [
  "futures-util",
  "pin-project",
  "tokio",
- "tokio-util",
+ "tokio-util 0.6.9",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -7773,7 +7786,7 @@ dependencies = [
  "tokio-rustls",
  "tokio-stream",
  "tokio-tungstenite",
- "tokio-util",
+ "tokio-util 0.6.9",
  "tower-service",
  "tracing",
  "tracing-futures",
diff --git a/common/rate-limiter/Cargo.toml b/common/rate-limiter/Cargo.toml
index ff3ef9a03ea7..6f62f522148c 100644
--- a/common/rate-limiter/Cargo.toml
+++ b/common/rate-limiter/Cargo.toml
@@ -17,4 +17,4 @@ diem-metrics = { path = "../metrics" }
 futures = "0.3.12"
 pin-project = "1.0.5"
 tokio = { version = "1.3.0", features = ["full"] }
-tokio-util = { version = "0.6.4", features = ["compat"] }
+tokio-util = { version = "0.7.1", features = ["compat"] }
diff --git a/common/workspace-hack/Cargo.toml b/common/workspace-hack/Cargo.toml
index 04424531ee81..62627d5ca511 100644
--- a/common/workspace-hack/Cargo.toml
+++ b/common/workspace-hack/Cargo.toml
@@ -49,7 +49,7 @@ serde_json = { version = "1.0.64", features = ["default", "indexmap", "preserve_
 standback = { version = "0.2.15", default-features = false, features = ["std"] }
 subtle = { version = "2.4.0", default-features = false, features = ["std"] }
 tokio = { version = "1.3.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] }
-tokio-util = { version = "0.6.4", features = ["codec", "compat", "default", "futures-io", "io"] }
+tokio-util = { version = "0.7.1", features = ["codec", "compat", "default", "futures-io", "io"] }
 toml = { version = "0.5.8", features = ["default"] }
 tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] }
 warp = { version = "0.3.0", features = ["default", "multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
@@ -99,7 +99,7 @@ subtle = { version = "2.4.0", default-features = false, features = ["std"] }
 syn-3575ec1268b04181 = { package = "syn", version = "0.15.44", features = ["clone-impls", "default", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"] }
 syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.62", features = ["clone-impls", "default", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
 tokio = { version = "1.3.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] }
-tokio-util = { version = "0.6.4", features = ["codec", "compat", "default", "futures-io", "io"] }
+tokio-util = { version = "0.7.1", features = ["codec", "compat", "default", "futures-io", "io"] }
 toml = { version = "0.5.8", features = ["default"] }
 tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] }
 warp = { version = "0.3.0", features = ["default", "multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
@@ -144,7 +144,7 @@ serde_json = { version = "1.0.64", features = ["default", "indexmap", "preserve_
 standback = { version = "0.2.15", default-features = false, features = ["std"] }
 subtle = { version = "2.4.0", default-features = false, features = ["std"] }
 tokio = { version = "1.3.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] }
-tokio-util = { version = "0.6.4", features = ["codec", "compat", "default", "futures-io", "io"] }
+tokio-util = { version = "0.7.1", features = ["codec", "compat", "default", "futures-io", "io"] }
 toml = { version = "0.5.8", features = ["default"] }
 tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] }
 warp = { version = "0.3.0", features = ["default", "multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
@@ -194,7 +194,7 @@ subtle = { version = "2.4.0", default-features = false, features = ["std"] }
 syn-3575ec1268b04181 = { package = "syn", version = "0.15.44", features = ["clone-impls", "default", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"] }
 syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.62", features = ["clone-impls", "default", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
 tokio = { version = "1.3.0", features = ["bytes", "default", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] }
-tokio-util = { version = "0.6.4", features = ["codec", "compat", "default", "futures-io", "io"] }
+tokio-util = { version = "0.7.1", features = ["codec", "compat", "default", "futures-io", "io"] }
 toml = { version = "0.5.8", features = ["default"] }
 tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] }
 warp = { version = "0.3.0", features = ["default", "multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
diff --git a/network/Cargo.toml b/network/Cargo.toml
index 71075b7072cf..08f49488fd62 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -27,7 +27,7 @@ thiserror = "1.0.24"
 tokio = { version = "1.3.0", features = ["full"] }
 tokio-retry = "0.3.0"
 tokio-stream = "0.1.4"
-tokio-util = { version = "0.6.4", features = ["compat", "codec"] }
+tokio-util = { version = "0.7.1", features = ["compat", "codec"] }
 
 bitvec = { path = "../common/bitvec", package = "diem-bitvec" }
 channel = { path = "../common/channel" }
diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml
index 20d993e5ee96..71fdc5e997f1 100644
--- a/network/netcore/Cargo.toml
+++ b/network/netcore/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.12"
 pin-project = "1.0.5"
 serde = { version = "1.0.124", default-features = false }
 tokio = { version = "1.3.0", features = ["full"] }
-tokio-util = { version = "0.6.4", features = ["compat"] }
+tokio-util = { version = "0.7.1", features = ["compat"] }
 url = { version = "2.2.1" }
 
 diem-workspace-hack = { path = "../../common/workspace-hack" }
diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml
index 4d5c806bf741..7a2dc5cb1370 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.12"
 tokio = { version = "1.3.0", features = ["full"] }
-tokio-util = { version = "0.6.4", features = ["compat", "codec"] }
+tokio-util = { version = "0.7.1", features = ["compat", "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 f2a416d6c055..db3270c2961a 100644
--- a/storage/backup/backup-cli/Cargo.toml
+++ b/storage/backup/backup-cli/Cargo.toml
@@ -28,7 +28,7 @@ structopt = "0.3.21"
 toml = "0.5.8"
 tokio = { version = "1.3.0", features = ["full"] }
 tokio-stream = "0.1.4"
-tokio-util = { version = "0.6.4", features = ["compat"] }
+tokio-util = { version = "0.7.1", features = ["compat"] }
 
 executor = { path = "../../../execution/executor" }
 executor-test-helpers = { path = "../../../execution/executor-test-helpers", optional = true }