From 5ebfd7bc55888d59fc603e08e457f39b0ed7cc14 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Thu, 11 Jul 2024 10:39:18 +0200 Subject: [PATCH] chore: Use `tokio` from the workspace. --- benchmarks/Cargo.toml | 2 +- bindings/matrix-sdk-ffi/Cargo.toml | 2 +- examples/autojoin/Cargo.toml | 2 +- examples/backups/Cargo.toml | 2 +- examples/command_bot/Cargo.toml | 2 +- examples/cross_signing_bootstrap/Cargo.toml | 2 +- examples/custom_events/Cargo.toml | 2 +- examples/emoji_verification/Cargo.toml | 2 +- examples/get_profiles/Cargo.toml | 2 +- examples/getting_started/Cargo.toml | 2 +- examples/image_bot/Cargo.toml | 2 +- examples/login/Cargo.toml | 2 +- examples/oidc_cli/Cargo.toml | 2 +- examples/persist_session/Cargo.toml | 2 +- examples/qr-login/Cargo.toml | 2 +- examples/secret_storage/Cargo.toml | 2 +- examples/timeline/Cargo.toml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 93b359b84..f2f4d939c 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -18,7 +18,7 @@ ruma = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } tempfile = "3.3.0" -tokio = { version = "1.24.2", default-features = false, features = ["rt-multi-thread"] } +tokio = { workspace = true, default-features = false, features = ["rt-multi-thread"] } [target.'cfg(target_os = "linux")'.dependencies] pprof = { version = "0.13.0", features = ["flamegraph", "criterion"] } diff --git a/bindings/matrix-sdk-ffi/Cargo.toml b/bindings/matrix-sdk-ffi/Cargo.toml index 4034d7261..d954bfb30 100644 --- a/bindings/matrix-sdk-ffi/Cargo.toml +++ b/bindings/matrix-sdk-ffi/Cargo.toml @@ -40,7 +40,7 @@ tracing = { workspace = true } tracing-core = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } tracing-appender = { version = "0.2.2" } -tokio = { version = "1", features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } uniffi = { workspace = true, features = ["tokio"] } url = { workspace = true } zeroize = { workspace = true } diff --git a/examples/autojoin/Cargo.toml b/examples/autojoin/Cargo.toml index 04bd45ca7..102764d1b 100644 --- a/examples/autojoin/Cargo.toml +++ b/examples/autojoin/Cargo.toml @@ -9,7 +9,7 @@ name = "example-autojoin" test = false [dependencies] -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } anyhow = "1" tracing-subscriber = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you diff --git a/examples/backups/Cargo.toml b/examples/backups/Cargo.toml index 6651ee560..284e8ed4d 100644 --- a/examples/backups/Cargo.toml +++ b/examples/backups/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } clap = { version = "4.0.15", features = ["derive"] } futures-util = "0.3.24" tracing-subscriber = { workspace = true } diff --git a/examples/command_bot/Cargo.toml b/examples/command_bot/Cargo.toml index 7a3de885d..b97cfb5b2 100644 --- a/examples/command_bot/Cargo.toml +++ b/examples/command_bot/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you # have copied the example as it was at the time of the release you use. diff --git a/examples/cross_signing_bootstrap/Cargo.toml b/examples/cross_signing_bootstrap/Cargo.toml index 2ca7c5907..1e4a7143e 100644 --- a/examples/cross_signing_bootstrap/Cargo.toml +++ b/examples/cross_signing_bootstrap/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } url = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you diff --git a/examples/custom_events/Cargo.toml b/examples/custom_events/Cargo.toml index 28a4cb07a..517e316f6 100644 --- a/examples/custom_events/Cargo.toml +++ b/examples/custom_events/Cargo.toml @@ -11,7 +11,7 @@ test = false [dependencies] anyhow = "1" serde = "1.0" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you # have copied the example as it was at the time of the release you use. diff --git a/examples/emoji_verification/Cargo.toml b/examples/emoji_verification/Cargo.toml index 216c573ec..0367c6277 100644 --- a/examples/emoji_verification/Cargo.toml +++ b/examples/emoji_verification/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } clap = { version = "4.0.15", features = ["derive"] } futures-util = "0.3.24" tracing-subscriber = { workspace = true } diff --git a/examples/get_profiles/Cargo.toml b/examples/get_profiles/Cargo.toml index ed6cadd8f..3093ea3ac 100644 --- a/examples/get_profiles/Cargo.toml +++ b/examples/get_profiles/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } url = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you diff --git a/examples/getting_started/Cargo.toml b/examples/getting_started/Cargo.toml index b33378967..c31543304 100644 --- a/examples/getting_started/Cargo.toml +++ b/examples/getting_started/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you # have copied the example as it was at the time of the release you use. diff --git a/examples/image_bot/Cargo.toml b/examples/image_bot/Cargo.toml index f6f525208..eff358647 100644 --- a/examples/image_bot/Cargo.toml +++ b/examples/image_bot/Cargo.toml @@ -11,7 +11,7 @@ test = false [dependencies] anyhow = "1" mime = "0.3.16" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } url = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you diff --git a/examples/login/Cargo.toml b/examples/login/Cargo.toml index 944a70369..5680250fa 100644 --- a/examples/login/Cargo.toml +++ b/examples/login/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } url = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you diff --git a/examples/oidc_cli/Cargo.toml b/examples/oidc_cli/Cargo.toml index a14ad3374..83f9e58b0 100644 --- a/examples/oidc_cli/Cargo.toml +++ b/examples/oidc_cli/Cargo.toml @@ -17,7 +17,7 @@ matrix-sdk-ui = { path = "../../crates/matrix-sdk-ui" } rand = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tower = { version = "0.4.13", features = ["make"] } tracing-subscriber = { workspace = true } url = { workspace = true } diff --git a/examples/persist_session/Cargo.toml b/examples/persist_session/Cargo.toml index 5ed5bdb51..0c5ba1f51 100644 --- a/examples/persist_session/Cargo.toml +++ b/examples/persist_session/Cargo.toml @@ -14,7 +14,7 @@ dirs = "5.0.1" rand = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you # have copied the example as it was at the time of the release you use. diff --git a/examples/qr-login/Cargo.toml b/examples/qr-login/Cargo.toml index 2d3a73a59..75f44b597 100644 --- a/examples/qr-login/Cargo.toml +++ b/examples/qr-login/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } clap = { version = "4.0.15", features = ["derive"] } qrcode = { git = "https://github.com/kennytm/qrcode-rust/" } futures-util = "0.3.24" diff --git a/examples/secret_storage/Cargo.toml b/examples/secret_storage/Cargo.toml index 0c14b71f6..506f63dfe 100644 --- a/examples/secret_storage/Cargo.toml +++ b/examples/secret_storage/Cargo.toml @@ -10,7 +10,7 @@ test = false [dependencies] anyhow = "1" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } clap = { version = "4.0.15", features = ["derive"] } tracing-subscriber = { workspace = true } url = { workspace = true } diff --git a/examples/timeline/Cargo.toml b/examples/timeline/Cargo.toml index a7973489c..fbbfe3d67 100644 --- a/examples/timeline/Cargo.toml +++ b/examples/timeline/Cargo.toml @@ -12,7 +12,7 @@ test = false anyhow = "1" clap = { version = "4.0.16", features = ["derive"] } futures-util = "0.3" -tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-subscriber = { workspace = true } url = { workspace = true } # when copy-pasting this, please use a git dependency or make sure that you