Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.

Bump tokio from 1.3.0 to 1.6.1 #406

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump tokio from 1.3.0 to 1.6.1 #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/faucet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ reqwest = { version = "0.11.2", features = ["blocking"], default-features = fals
serde = "1.0.124"
serde_derive = "1.0.117"
structopt = "0.3.21"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
warp = "0.3.0"

generate-key = { path = "../../config/generate-key" }
Expand Down
2 changes: 1 addition & 1 deletion client/json-rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rand = "0.8.3"
reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false }
serde = { version = "1.0.124", default-features = false }
serde_json = "1.0.64"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }

diem-crypto = { path = "../../crypto/crypto" }
bcs = "0.1.2"
Expand Down
4 changes: 2 additions & 2 deletions common/bounded-executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
futures = "0.3.12"
diem-workspace-hack = { path = "../workspace-hack" }
tokio = { version = "1.3.0", features = ["sync"] }
tokio = { version = "1.6.1", features = ["sync"] }

[dev-dependencies]
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
2 changes: 1 addition & 1 deletion common/channel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ diem-workspace-hack = { path = "../workspace-hack" }

[dev-dependencies]
diem-types = { path = "../../types" }
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
2 changes: 1 addition & 1 deletion common/debug-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.38"
bytes = "1.0.1"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false }
warp = "0.3.0"

Expand Down
2 changes: 1 addition & 1 deletion common/metrics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ hyper = { version = "0.14.4", features = ["full"] }
once_cell = "1.7.2"
prometheus = { version = "0.12.0", default-features = false }
serde_json = "1.0.64"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }

diem-logger = { path = "../logger" }
diem-metrics-core = { path = "../metrics-core" }
Expand Down
2 changes: 1 addition & 1 deletion common/rate-limiter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ diem-logger = { path = "../logger" }
diem-metrics = { path = "../metrics" }
futures = "0.3.12"
pin-project = "1.0.5"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
tokio-util = { version = "0.6.4", features = ["compat"] }
2 changes: 1 addition & 1 deletion common/retrier/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ edition = "2018"

[dependencies]
diem-workspace-hack = { path = "../workspace-hack" }
tokio = { version = "1.3.0", features = ["time"] }
tokio = { version = "1.6.1", features = ["time"] }
diem-logger = { path = "../logger"}
4 changes: 2 additions & 2 deletions common/time-service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ enum_dispatch = "0.3.5"
futures = { version = "0.3.12", optional = true }
pin-project = { version = "1.0.5", optional = true }
thiserror = "1.0.24"
tokio = { version = "1.3.0", features = ["macros", "rt-multi-thread", "time"], optional = true }
tokio = { version = "1.6.1", features = ["macros", "rt-multi-thread", "time"], optional = true }

diem-infallible = { path = "../infallible" }
diem-workspace-hack = { path = "../workspace-hack" }

[dev-dependencies]
futures = "0.3.12"
pin-project = "1.0.5"
tokio = { version = "1.3.0", features = ["macros", "rt-multi-thread", "time"] }
tokio = { version = "1.6.1", features = ["macros", "rt-multi-thread", "time"] }
tokio-test = "0.4.0"

[features]
Expand Down
2 changes: 1 addition & 1 deletion common/trace/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2018"
[dependencies]
chrono = "0.4.19"
structopt = "0.3.21"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
serde_json = "1.0.64"
serde = "1.0.124"
anyhow = "1.0.38"
Expand Down
8 changes: 4 additions & 4 deletions common/workspace-hack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ serde = { version = "1.0.124", features = ["alloc", "default", "derive", "rc", "
serde_json = { version = "1.0.64", features = ["default", "indexmap", "preserve_order", "std"] }
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 = { version = "1.6.1", 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"] }
toml = { version = "0.5.8", features = ["default"] }
tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] }
Expand Down Expand Up @@ -98,7 +98,7 @@ standback = { version = "0.2.15", default-features = false, features = ["std"] }
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 = { version = "1.6.1", 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"] }
toml = { version = "0.5.8", features = ["default"] }
tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] }
Expand Down Expand Up @@ -143,7 +143,7 @@ serde = { version = "1.0.124", features = ["alloc", "default", "derive", "rc", "
serde_json = { version = "1.0.64", features = ["default", "indexmap", "preserve_order", "std"] }
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 = { version = "1.6.1", 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"] }
toml = { version = "0.5.8", features = ["default"] }
tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] }
Expand Down Expand Up @@ -193,7 +193,7 @@ standback = { version = "0.2.15", default-features = false, features = ["std"] }
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 = { version = "1.6.1", 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"] }
toml = { version = "0.5.8", features = ["default"] }
tracing = { version = "0.1.25", features = ["attributes", "default", "log", "std", "tracing-attributes"] }
Expand Down
2 changes: 1 addition & 1 deletion consensus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ serde = { version = "1.0.124", default-features = false }
serde_json = "1.0.64"
termion = { version = "1.5.6", default-features = false }
thiserror = "1.0.24"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }

channel = { path = "../common/channel" }
consensus-types = { path = "consensus-types", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion diem-node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fail = "0.4.0"
futures = "0.3.12"
jemallocator = { version = "0.3.2", features = ["profiling", "unprefixed_malloc_on_supported_platforms"] }
structopt = "0.3.21"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
tokio-stream = "0.1.4"

backup-service = { path = "../storage/backup/backup-service" }
Expand Down
2 changes: 1 addition & 1 deletion json-rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ once_cell = "1.7.2"
rand = "0.8.3"
serde_json = "1.0.64"
serde = { version = "1.0.124", features = ["derive"], default-features = false }
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
warp = { version = "0.3.0", features = ["tls"] }
reqwest = { version = "0.11.2", features = ["blocking", "json"], default_features = false, optional = true }
proptest = { version = "1.0.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion language/diem-tools/diem-events-fetcher/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ hex = "0.4.3"
reqwest = { version = "0.11.2", features = ["blocking", "json"] }
structopt = "0.3.21"
futures = "0.3.12"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }

diem-workspace-hack = { path = "../../../common/workspace-hack" }
diem-client = { path = "../../../sdk/client" }
Expand Down
2 changes: 1 addition & 1 deletion language/move-prover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ serde = { version = "1.0.124", features = ["derive"] }
serde_json = "1.0.64"
simplelog = "0.9.0"
once_cell = "1.7.2"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
toml = "0.5.8"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion language/move-prover/boogie-backend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ regex = "1.4.3"
rand = "0.8.3"
futures = "0.3.12"
handlebars = "3.5.3"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
codespan = "0.8.0"
codespan-reporting = "0.8.0"

Expand Down
2 changes: 1 addition & 1 deletion mempool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ once_cell = "1.7.2"
proptest = { version = "1.0.0", optional = true }
rayon = "1.4.1"
serde = { version = "1.0.124", default-features = false }
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
tokio-stream = "0.1.4"

bounded-executor = { path = "../common/bounded-executor" }
Expand Down
2 changes: 1 addition & 1 deletion network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rand_core = { version = "0.6.2", optional = true }
serde = { version = "1.0.124", default-features = false }
serde_bytes = "0.11.5"
thiserror = "1.0.24"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
tokio-retry = "0.3.0"
tokio-stream = "0.1.4"
tokio-util = { version = "0.6.4", features = ["compat", "codec"] }
Expand Down
2 changes: 1 addition & 1 deletion network/builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ edition = "2018"
futures = "0.3.12"
rand = "0.8.3"
serde = { version = "1.0.124", default-features = false }
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }

channel = { path = "../../common/channel" }
bcs = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion network/netcore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ bytes = "1.0.1"
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 = { version = "1.6.1", features = ["full"] }
tokio-util = { version = "0.6.4", features = ["compat"] }
url = { version = "2.2.1" }

Expand Down
2 changes: 1 addition & 1 deletion network/simple-onchain-discovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2018"
anyhow = "1.0.38"
futures = "0.3.12"
once_cell = "1.7.2"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }

channel = {path = "../../common/channel"}
bcs = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion network/socket-bench-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2018"

[dependencies]
futures = "0.3.12"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
tokio-util = { version = "0.6.4", features = ["compat", "codec"] }

diem-crypto = { path = "../../crypto/crypto" }
Expand Down
2 changes: 1 addition & 1 deletion sdk/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ diem-types = { path = "../../types", version = "0.0.1" }

# Optional Dependencies
reqwest = { version = "0.11.2", features = ["json"], optional = true }
tokio = { version = "1.3.0", features = ["time"], default_features = false, optional = true }
tokio = { version = "1.6.1", features = ["time"], default_features = false, optional = true }
ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false, optional = true }
ipnet = { version = "2.3", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion secure/key-manager/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ diem-transaction-builder = { path = "../../client/transaction-builder" }
[dev-dependencies]
futures = "0.3.12"
rand = "0.8.3"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }

executor = { path = "../../execution/executor" }
executor-test-helpers = { path = "../../execution/executor-test-helpers" }
Expand Down
2 changes: 1 addition & 1 deletion state-sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ proptest = { version = "1.0.0", optional = true }
rand = "0.8.3"
serde = { version = "1.0.124", default-features = false }
thiserror = "1.0.24"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
tokio-stream = "0.1.4"

channel = { path = "../common/channel" }
Expand Down
2 changes: 1 addition & 1 deletion storage/backup/backup-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ serde = { version = "1.0.124", features = ["derive"] }
serde_json = "1.0.64"
structopt = "0.3.21"
toml = "0.5.8"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
tokio-stream = "0.1.4"
tokio-util = { version = "0.6.4", features = ["compat"] }

Expand Down
2 changes: 1 addition & 1 deletion storage/backup/backup-service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ futures = "0.3.12"
hyper = "0.14.4"
once_cell = "1.7.2"
serde = { version = "1.0.124", default-features = false }
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
warp = "0.3.0"

bcs = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion storage/storage-service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2018"

[dependencies]
anyhow = "1.0.38"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
futures = "0.3.12"

bcs = "0.1.2"
Expand Down
2 changes: 1 addition & 1 deletion testsuite/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ once_cell = "1.7.2"
reqwest = { version = "0.11.2", features = ["blocking", "json"] }
serde = { version = "1.0.124", features = ["derive"] }
structopt = "0.3.21"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
walkdir = "2.3.1"

diem-config = { path = "../../config" }
Expand Down
2 changes: 1 addition & 1 deletion testsuite/cluster-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ state-sync = { path = "../../state-sync" }
transaction-builder = { path = "../../language/transaction-builder" }

futures = "0.3.12"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }
async-trait = "0.1.42"

kube = "0.51.0"
Expand Down
2 changes: 1 addition & 1 deletion testsuite/smoke-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ regex = "1.4.3"
rust_decimal = "1.10.3"
rusty-fork = "0.3.0"
statistical = "1.0.0"
tokio = { version = "1.3.0", features = ["full"] }
tokio = { version = "1.6.1", features = ["full"] }

backup-cli = { path = "../../storage/backup/backup-cli" }
cli = { path = "../cli", features = ["fuzzing"] }
Expand Down