Skip to content

build(deps): bump tokio from 1.17.0 to 1.18.5 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

build(deps): bump tokio from 1.17.0 to 1.18.5 #14

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
102 changes: 77 additions & 25 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.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ tikv_kv = { path = "components/tikv_kv", default-features = false }
tikv_util = { path = "components/tikv_util", default-features = false }
time = "0.1"
tipb = { git = "https://github.com/pingcap/tipb.git" }
tokio = { version = "1.17", features = ["full"] }
tokio = { version = "1.18", features = ["full"] }
tokio-openssl = "0.6"
tokio-timer = { git = "https://github.com/tikv/tokio", branch = "tokio-timer-hotfix" }
toml = "0.5"
Expand All @@ -180,7 +180,7 @@ panic_hook = { path = "components/panic_hook" }
reqwest = { version = "0.11", features = ["blocking"] }
test_sst_importer = { path = "components/test_sst_importer", default-features = false }
test_util = { path = "components/test_util", default-features = false }
tokio = { version = "1.17", features = ["macros", "rt-multi-thread", "time"] }
tokio = { version = "1.18", features = ["macros", "rt-multi-thread", "time"] }
zipf = "6.1.0"

[patch.crates-io]
Expand Down
2 changes: 1 addition & 1 deletion cmd/tikv-ctl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ tempfile = "3.0"
tikv = { path = "../../", default-features = false }
tikv_alloc = { path = "../../components/tikv_alloc" }
tikv_util = { path = "../../components/tikv_util", default-features = false }
tokio = { version = "1.5", features = ["rt-multi-thread", "time"] }
tokio = { version = "1.18", features = ["rt-multi-thread", "time"] }
toml = "0.5"
txn_types = { path = "../../components/txn_types", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion components/backup-stream/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ tidb_query_datatype = { path = "../tidb_query_datatype", default-features = fals
tikv = { path = "../../", default-features = false }
tikv_alloc = { path = "../tikv_alloc" }
tikv_util = { path = "../tikv_util" }
tokio = { version = "1.5", features = ["rt-multi-thread", "macros", "time", "sync"] }
tokio = { version = "1.18", features = ["rt-multi-thread", "macros", "time", "sync"] }
tokio-stream = "0.1"
tokio-util = { version = "0.7", features = ["compat"] }
tonic = "0.5"
Expand Down
4 changes: 2 additions & 2 deletions components/backup/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ tidb_query_common = { path = "../tidb_query_common", default-features = false }
tikv = { path = "../../", default-features = false }
tikv_alloc = { path = "../tikv_alloc" }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["rt-multi-thread"] }
tokio = { version = "1.18", features = ["rt-multi-thread"] }
tokio-stream = "0.1"
txn_types = { path = "../txn_types", default-features = false }
yatp = { git = "https://github.com/tikv/yatp.git", branch = "master" }

[dev-dependencies]
rand = "0.8"
tempfile = "3.0"
tokio = { version = "1.5", features = ["time", "macros"] }
tokio = { version = "1.18", features = ["time", "macros"] }
2 changes: 1 addition & 1 deletion components/cdc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ thiserror = "1.0"
tikv = { path = "../..", default-features = false }
tikv_kv = { path = "../tikv_kv", default-features = false }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["rt-multi-thread", "time"] }
tokio = { version = "1.18", features = ["rt-multi-thread", "time"] }
txn_types = { path = "../txn_types", default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion components/cloud/aws/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rusoto_sts = "0.46.0"
rusoto_s3 = { version = "0.46.0", features = ["serialize_structs"] }
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
# better to not use slog-global, but pass in the logger
tokio = { version = "1.5", features = ["time"] }
tokio = { version = "1.18", features = ["time"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
tikv_util = { path = "../../tikv_util", default-features = false }
url = "2.0"
Expand Down
2 changes: 1 addition & 1 deletion components/cloud/azure/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ oauth2 = { version = "4.0.0", default-features = false }
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
tikv_util = { path = "../../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["time"] }
tokio = { version = "1.18", features = ["time"] }
url = "2.0"
2 changes: 1 addition & 1 deletion components/cloud/gcp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tame-gcs = { version = "0.10", features = ["async-multipart"] }
tame-oauth = "0.4.7"
cloud = { path = "../", default-features = false }
tikv_util = { path = "../../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["time"] }
tokio = { version = "1.18", features = ["time"] }
url = "2.0"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion components/concurrency_manager/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fail = "0.5"
kvproto = { git = "https://github.com/pingcap/kvproto.git" }
parking_lot = "0.12"
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["macros", "sync", "time"] }
tokio = { version = "1.18", features = ["macros", "sync", "time"] }
txn_types = { path = "../txn_types", default-features = false }

# FIXME: switch to the crates.io version after crossbeam-skiplist is released
Expand Down
2 changes: 1 addition & 1 deletion components/encryption/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global
thiserror = "1.0"
tikv_alloc = { path = "../tikv_alloc" }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["time", "rt"] }
tokio = { version = "1.18", features = ["time", "rt"] }

[dev-dependencies]
matches = "0.1.8"
Expand Down
4 changes: 2 additions & 2 deletions components/external_storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debu
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
tikv_alloc = { path = "../tikv_alloc" }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["time", "fs", "process"] }
tokio = { version = "1.18", features = ["time", "fs", "process"] }
tokio-util = { version = "0.7", features = ["compat"] }
url = "2.0"

Expand All @@ -50,4 +50,4 @@ matches = "0.1.8"
rust-ini = "0.14.0"
structopt = "0.3"
tempfile = "3.1"
tokio = { version = "1.5", features = ["macros"] }
tokio = { version = "1.18", features = ["macros"] }
4 changes: 2 additions & 2 deletions components/external_storage/export/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ once_cell = { optional = true, version = "1.3.1" }
protobuf = { optional = true, version = "2" }
slog-global = { optional = true, version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
tikv_util = { path = "../../tikv_util" }
tokio = { version = "1.5", features = ["time", "rt", "net"], optional = true }
tokio = { version = "1.18", features = ["time", "rt", "net"], optional = true }
tokio-util = { version = "0.7", features = ["compat"], optional = true }
url = "2.0"
async-trait = "0.1"
Expand All @@ -81,7 +81,7 @@ futures-util = { version = "0.3", default-features = false, features = ["io"] }
rust-ini = "0.14.0"
structopt = "0.3"
tempfile = "3.1"
tokio = { version = "1.5", features = ["time"] }
tokio = { version = "1.18", features = ["time"] }

[[example]]
name = "scli"
Expand Down
2 changes: 1 addition & 1 deletion components/file_system/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global
strum = { version = "0.20", features = ["derive"] }
tikv_alloc = { path = "../tikv_alloc" }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["time"] }
tokio = { version = "1.18", features = ["time"] }

[dev-dependencies]
maligned = "0.2.1"
Expand Down
2 changes: 1 addition & 1 deletion components/raftstore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ tidb_query_datatype = { path = "../tidb_query_datatype", default-features = fals
tikv_alloc = { path = "../tikv_alloc" }
tikv_util = { path = "../tikv_util", default-features = false }
time = "0.1"
tokio = { version = "1.5", features = ["sync", "rt-multi-thread"] }
tokio = { version = "1.18", features = ["sync", "rt-multi-thread"] }
tracker = { path = "../tracker" }
txn_types = { path = "../txn_types", default-features = false }
uuid = { version = "0.8.1", features = ["serde", "v4"] }
Expand Down
2 changes: 1 addition & 1 deletion components/resolved_ts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global
thiserror = "1.0"
tikv = { path = "../../", default-features = false }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["rt-multi-thread", "time"] }
tokio = { version = "1.18", features = ["rt-multi-thread", "time"] }
txn_types = { path = "../txn_types", default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion components/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ tempfile = "3.0"
tikv = { path = "../..", default-features = false }
tikv_alloc = { path = "../tikv_alloc" }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["rt-multi-thread"] }
tokio = { version = "1.18", features = ["rt-multi-thread"] }
toml = "0.5"
txn_types = { path = "../txn_types", default-features = false }
yatp = { git = "https://github.com/tikv/yatp.git", branch = "master" }
Expand Down
2 changes: 1 addition & 1 deletion components/sst_importer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global
thiserror = "1.0"
tikv_alloc = { path = "../tikv_alloc" }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["time", "rt-multi-thread", "macros"] }
tokio = { version = "1.18", features = ["time", "rt-multi-thread", "macros"] }
txn_types = { path = "../txn_types", default-features = false }
uuid = { version = "0.8.1", features = ["serde", "v4"] }

Expand Down
2 changes: 1 addition & 1 deletion components/test_raftstore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ tempfile = "3.0"
test_util = { path = "../test_util", default-features = false }
tikv = { path = "../../", default-features = false }
tikv_util = { path = "../tikv_util", default-features = false }
tokio = { version = "1.5", features = ["rt-multi-thread"] }
tokio = { version = "1.18", features = ["rt-multi-thread"] }
tokio-timer = { git = "https://github.com/tikv/tokio", branch = "tokio-timer-hotfix" }
txn_types = { path = "../txn_types", default-features = false }
2 changes: 1 addition & 1 deletion components/tikv_util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ sysinfo = "0.16"
thiserror = "1.0"
tikv_alloc = { path = "../tikv_alloc" }
time = "0.1"
tokio = { version = "1.5", features = ["rt-multi-thread"] }
tokio = { version = "1.18", features = ["rt-multi-thread"] }
tokio-executor = "0.1"
tokio-timer = { git = "https://github.com/tikv/tokio", branch = "tokio-timer-hotfix" }
tracker = { path = "../tracker" }
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ test_storage = { path = "../components/test_storage", default-features = false }
test_util = { path = "../components/test_util", default-features = false }
tidb_query_datatype = { path = "../components/tidb_query_datatype", default-features = false }
tipb_helper = { path = "../components/tipb_helper", default-features = false }
tokio = { version = "1.5", features = ["rt-multi-thread"] }
tokio = { version = "1.18", features = ["rt-multi-thread"] }

[target.'cfg(all(target_os = "linux", target_arch = "x86_64"))'.dev-dependencies]
criterion-perf-events = "0.1"
Expand Down