From 07ab7bb6fc151680c150c77e883191280ee8ef6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Nov 2020 20:36:27 +0000
Subject: [PATCH] Bump tokio-util from 0.3.1 to 0.5.0

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

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

diff --git a/Cargo.lock b/Cargo.lock
index 24849f94d72b..f31d62555acb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -178,7 +178,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb1ff21a63d3262af46b9f33a826a8d134e2d0d9b2179c86034948b732ea8b2a"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "flate2",
  "futures-core",
  "memchr",
@@ -241,7 +241,7 @@ dependencies = [
  "async-trait",
  "backup-service",
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "executor",
  "executor-test-helpers",
  "executor-types",
@@ -272,8 +272,8 @@ dependencies = [
  "serde_json",
  "storage-interface",
  "structopt 0.3.20",
- "tokio",
- "tokio-util",
+ "tokio 0.2.22",
+ "tokio-util 0.5.0",
  "toml",
 ]
 
@@ -282,7 +282,7 @@ name = "backup-service"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bytes",
+ "bytes 0.5.6",
  "futures 0.3.8",
  "hyper",
  "libra-canonical-serialization",
@@ -298,7 +298,7 @@ dependencies = [
  "reqwest",
  "serde",
  "storage-interface",
- "tokio",
+ "tokio 0.2.22",
  "warp",
 ]
 
@@ -439,7 +439,7 @@ version = "0.1.0"
 dependencies = [
  "futures 0.3.8",
  "libra-workspace-hack",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -560,6 +560,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bytes"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16"
+
 [[package]]
 name = "c_linked_list"
 version = "1.1.1"
@@ -636,7 +642,7 @@ dependencies = [
  "libra-metrics",
  "libra-types",
  "libra-workspace-hack",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -726,7 +732,7 @@ dependencies = [
  "rustyline",
  "serde",
  "structopt 0.3.20",
- "tokio",
+ "tokio 0.2.22",
  "transaction-builder",
  "walkdir",
 ]
@@ -803,7 +809,7 @@ dependencies = [
  "state-synchronizer",
  "structopt 0.3.20",
  "termion",
- "tokio",
+ "tokio 0.2.22",
  "toml",
  "transaction-builder",
 ]
@@ -893,7 +899,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "channel",
  "consensus-types",
  "crash-handler",
@@ -934,7 +940,7 @@ dependencies = [
  "tempfile",
  "termion",
  "thiserror",
- "tokio",
+ "tokio 0.2.22",
  "vm-genesis",
  "vm-validator",
 ]
@@ -1254,12 +1260,12 @@ name = "debug-interface"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bytes",
+ "bytes 0.5.6",
  "libra-logger",
  "libra-metrics",
  "libra-workspace-hack",
  "reqwest",
- "tokio",
+ "tokio 0.2.22",
  "warp",
 ]
 
@@ -2105,7 +2111,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",
@@ -2113,8 +2119,8 @@ dependencies = [
  "http",
  "indexmap",
  "slab",
- "tokio",
- "tokio-util",
+ "tokio 0.2.22",
+ "tokio-util 0.3.1",
  "tracing",
  "tracing-futures",
 ]
@@ -2153,7 +2159,7 @@ checksum = "ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f"
 dependencies = [
  "base64 0.12.3",
  "bitflags",
- "bytes",
+ "bytes 0.5.6",
  "headers-core",
  "http",
  "mime",
@@ -2241,7 +2247,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",
 ]
@@ -2252,7 +2258,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "http",
 ]
 
@@ -2289,7 +2295,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",
@@ -2301,7 +2307,7 @@ dependencies = [
  "itoa",
  "pin-project 1.0.1",
  "socket2",
- "tokio",
+ "tokio 0.2.22",
  "tower-service",
  "tracing",
  "want",
@@ -2313,10 +2319,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",
 ]
 
@@ -2380,7 +2386,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
 ]
 
 [[package]]
@@ -2544,7 +2550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57f95fd36c08ce592e67400a0f1a66f432196997d5a7e9a97e8743c33d8a9312"
 dependencies = [
  "base64 0.12.3",
- "bytes",
+ "bytes 0.5.6",
  "chrono",
  "serde",
  "serde-value",
@@ -2575,7 +2581,7 @@ checksum = "f4f52dbe2c0e7ca54e43f1bc7b77b916750e63d7694e5a18c09b11307acc6b9d"
 dependencies = [
  "Inflector",
  "base64 0.12.3",
- "bytes",
+ "bytes 0.5.6",
  "chrono",
  "dirs 3.0.1",
  "either",
@@ -2593,7 +2599,7 @@ dependencies = [
  "static_assertions",
  "thiserror",
  "time 0.2.22",
- "tokio",
+ "tokio 0.2.22",
  "url",
 ]
 
@@ -2769,7 +2775,7 @@ dependencies = [
  "anyhow",
  "bitvec",
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "criterion",
  "curve25519-dalek 3.0.0 (git+https://github.com/novifinancial/curve25519-dalek.git?branch=fiat3)",
  "curve25519-dalek 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2861,7 +2867,7 @@ dependencies = [
  "libra-workspace-hack",
  "reqwest",
  "structopt 0.3.20",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -2886,7 +2892,7 @@ dependencies = [
  "serde_json",
  "structopt 0.3.20",
  "tempfile",
- "tokio",
+ "tokio 0.2.22",
  "transaction-builder-generated",
  "warp",
 ]
@@ -3065,7 +3071,7 @@ dependencies = [
  "serde",
  "serde_json",
  "storage-interface",
- "tokio",
+ "tokio 0.2.22",
  "transaction-builder-generated",
  "vm-genesis",
  "vm-validator",
@@ -3087,7 +3093,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "tokio",
+ "tokio 0.2.22",
  "warp",
 ]
 
@@ -3140,7 +3146,7 @@ dependencies = [
  "serde",
  "storage-interface",
  "thiserror",
- "tokio",
+ "tokio 0.2.22",
  "transaction-builder-generated",
  "vm-validator",
 ]
@@ -3236,7 +3242,7 @@ dependencies = [
  "storage-interface",
  "storage-service",
  "subscription-service",
- "tokio",
+ "tokio 0.2.22",
  "vm-validator",
 ]
 
@@ -3255,7 +3261,7 @@ dependencies = [
  "prometheus",
  "rusty-fork",
  "serde_json",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -3345,7 +3351,7 @@ dependencies = [
  "storage-service",
  "structopt 0.3.20",
  "subscription-service",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -3397,7 +3403,7 @@ version = "0.1.0"
 dependencies = [
  "libra-logger",
  "libra-workspace-hack",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -3421,7 +3427,7 @@ dependencies = [
  "serde_json",
  "storage-interface",
  "thiserror",
- "tokio",
+ "tokio 0.2.22",
  "ureq",
  "vm-validator",
 ]
@@ -3550,7 +3556,7 @@ dependencies = [
  "serde",
  "serde_json",
  "structopt 0.3.20",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -3584,7 +3590,7 @@ name = "libra-types"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bytes",
+ "bytes 0.5.6",
  "chrono",
  "hex",
  "itertools 0.9.0",
@@ -3697,7 +3703,7 @@ dependencies = [
 name = "libra-workspace-hack"
 version = "0.1.0"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "cc",
  "log",
  "memchr",
@@ -3872,7 +3878,7 @@ dependencies = [
 name = "memsocket"
 version = "0.1.0"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "futures 0.3.8",
  "libra-infallible",
  "libra-workspace-hack",
@@ -4164,7 +4170,7 @@ dependencies = [
  "simplelog",
  "spec-lang",
  "test-utils",
- "tokio",
+ "tokio 0.2.22",
  "toml",
  "vm",
 ]
@@ -4313,7 +4319,7 @@ name = "netcore"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "bytes",
+ "bytes 0.5.6",
  "futures 0.3.8",
  "libra-logger",
  "libra-network-address",
@@ -4322,7 +4328,7 @@ dependencies = [
  "memsocket",
  "pin-project 0.4.27",
  "serde",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -4330,7 +4336,7 @@ name = "network"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bytes",
+ "bytes 0.5.6",
  "channel",
  "criterion",
  "futures 0.3.8",
@@ -4364,9 +4370,9 @@ dependencies = [
  "short-hex-str",
  "socket-bench-server",
  "thiserror",
- "tokio",
+ "tokio 0.2.22",
  "tokio-retry",
- "tokio-util",
+ "tokio-util 0.5.0",
 ]
 
 [[package]]
@@ -4393,7 +4399,7 @@ dependencies = [
  "serde",
  "storage-interface",
  "subscription-service",
- "tokio",
+ "tokio 0.2.22",
  "tokio-retry",
 ]
 
@@ -4417,7 +4423,7 @@ dependencies = [
  "network",
  "once_cell",
  "subscription-service",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -5056,7 +5062,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",
 ]
 
@@ -5066,7 +5072,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",
@@ -5097,7 +5103,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa"
 dependencies = [
- "bytes",
+ "bytes 0.5.6",
  "prost",
 ]
 
@@ -5480,7 +5486,7 @@ checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e"
 dependencies = [
  "async-compression",
  "base64 0.12.3",
- "bytes",
+ "bytes 0.5.6",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -5500,7 +5506,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio",
+ "tokio 0.2.22",
  "tokio-tls",
  "url",
  "wasm-bindgen",
@@ -5558,7 +5564,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",
@@ -5573,7 +5579,7 @@ checksum = "e977941ee0658df96fca7291ecc6fc9a754600b21ad84b959eb1dbbc9d5abcc7"
 dependencies = [
  "async-trait",
  "base64 0.12.3",
- "bytes",
+ "bytes 0.5.6",
  "crc32fast",
  "futures 0.3.8",
  "http",
@@ -5589,7 +5595,7 @@ dependencies = [
  "rustc_version",
  "serde",
  "serde_json",
- "tokio",
+ "tokio 0.2.22",
  "xml-rs",
 ]
 
@@ -5609,7 +5615,7 @@ dependencies = [
  "serde",
  "serde_json",
  "shlex",
- "tokio",
+ "tokio 0.2.22",
  "zeroize",
 ]
 
@@ -5620,7 +5626,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",
@@ -5633,7 +5639,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",
@@ -5648,7 +5654,7 @@ dependencies = [
  "serde",
  "sha2",
  "time 0.2.22",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -5658,7 +5664,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",
@@ -6220,7 +6226,7 @@ dependencies = [
  "regex",
  "rust_decimal",
  "statistical",
- "tokio",
+ "tokio 0.2.22",
  "transaction-builder",
 ]
 
@@ -6240,8 +6246,8 @@ dependencies = [
  "network",
  "network-builder",
  "rand 0.7.3",
- "tokio",
- "tokio-util",
+ "tokio 0.2.22",
+ "tokio-util 0.5.0",
 ]
 
 [[package]]
@@ -6301,7 +6307,7 @@ name = "state-synchronizer"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bytes",
+ "bytes 0.5.6",
  "channel",
  "compiled-stdlib",
  "executor",
@@ -6336,7 +6342,7 @@ dependencies = [
  "storage-interface",
  "storage-service",
  "subscription-service",
- "tokio",
+ "tokio 0.2.22",
  "transaction-builder",
  "vm-genesis",
 ]
@@ -6489,7 +6495,7 @@ dependencies = [
  "rand 0.7.3",
  "storage-client",
  "storage-interface",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -6853,7 +6859,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",
@@ -6871,6 +6877,17 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ca08accbcb46f11fd8d2d1c6158c348b7888009a1f39260bcad66f6a454250"
+dependencies = [
+ "autocfg 1.0.1",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "tokio-executor"
 version = "0.1.10"
@@ -6922,7 +6939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
 dependencies = [
  "native-tls",
- "tokio",
+ "tokio 0.2.22",
 ]
 
 [[package]]
@@ -6934,7 +6951,7 @@ dependencies = [
  "futures-util",
  "log",
  "pin-project 0.4.27",
- "tokio",
+ "tokio 0.2.22",
  "tungstenite",
 ]
 
@@ -6944,13 +6961,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-sink",
+ "log",
+ "pin-project-lite",
+ "tokio 0.2.22",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73af76301319bcacf00d26d3c75534ef248dcad7ceaf36d93ec902453c3b1706"
+dependencies = [
+ "bytes 0.6.0",
  "futures-core",
  "futures-io",
  "futures-sink",
  "log",
  "pin-project-lite",
- "tokio",
+ "tokio 0.3.3",
 ]
 
 [[package]]
@@ -7072,7 +7103,7 @@ checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23"
 dependencies = [
  "base64 0.12.3",
  "byteorder",
- "bytes",
+ "bytes 0.5.6",
  "http",
  "httparse",
  "input_buffer",
@@ -7348,7 +7379,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",
@@ -7362,7 +7393,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio",
+ "tokio 0.2.22",
  "tokio-tungstenite",
  "tower-service",
  "tracing",
diff --git a/network/Cargo.toml b/network/Cargo.toml
index 7b7d5dd29133..2d80940aa724 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.5.0", features = ["codec"] }
 
 bitvec = { path = "../common/bitvec", version = "0.1.0", package = "libra-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 4b790223b3ed..ff9cd8acc9b3 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.5.0", features = ["codec"] }
 
 libra-crypto = { path = "../../crypto/crypto" }
 libra-config = { path = "../../config" }
diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml
index daa6b240bb9a..acea44a09e5a 100644
--- a/storage/backup/backup-cli/Cargo.toml
+++ b/storage/backup/backup-cli/Cargo.toml
@@ -27,7 +27,7 @@ serde_json = "1.0.59"
 structopt = "0.3.20"
 toml = "0.5.7"
 tokio = { version = "0.2.22", features = ["full"] }
-tokio-util = { version = "0.3.1", features = ["compat"] }
+tokio-util = { version = "0.5.0", features = ["compat"] }
 
 executor = { path = "../../../execution/executor", version = "0.1.0" }
 executor-test-helpers = { path = "../../../execution/executor-test-helpers", version = "0.1.0", optional = true }