From cd9e728c7184f799e333b7f29180393b0b44ff6e Mon Sep 17 00:00:00 2001 From: Yagiz Nizipli Date: Tue, 26 Mar 2024 15:23:18 -0400 Subject: [PATCH] chore: update tokio to latest version (#1420) --- Cargo.toml | 5 +++++ crates/symbolicator-js/Cargo.toml | 2 +- crates/symbolicator-native/Cargo.toml | 4 ++-- crates/symbolicator-proguard/Cargo.toml | 2 +- crates/symbolicator-service/Cargo.toml | 4 ++-- crates/symbolicator-stress/Cargo.toml | 2 +- crates/symbolicator-test/Cargo.toml | 2 +- crates/symbolicator/Cargo.toml | 6 +++--- crates/symbolicli/Cargo.toml | 2 +- 9 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 35c36bfea..4eeed7b90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,3 +52,8 @@ cpp_demangle = { git = "https://github.com/getsentry/cpp_demangle", branch = "se # See also https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html # [patch.crates-io] # symbolic-debuginfo = { path = "../symbolic/symbolic-debuginfo" } + +[workspace.dependencies] +tokio = "1.36.0" +tokio-metrics = "0.3.1" +tokio-util = "0.7.10" diff --git a/crates/symbolicator-js/Cargo.toml b/crates/symbolicator-js/Cargo.toml index 35f6cf404..f5bb543e4 100644 --- a/crates/symbolicator-js/Cargo.toml +++ b/crates/symbolicator-js/Cargo.toml @@ -29,7 +29,7 @@ symbolic = { version = "12.7.1", features = ["common-serde", "sourcemapcache"] } symbolicator-service = { path = "../symbolicator-service" } symbolicator-sources = { path = "../symbolicator-sources" } tempfile = "3.2.0" -tokio = { version = "1.24.2", features = ["rt", "macros", "fs"] } +tokio = { workspace = true, features = ["rt", "macros", "fs"] } tracing = "0.1.34" url = { version = "2.2.0", features = ["serde"] } diff --git a/crates/symbolicator-native/Cargo.toml b/crates/symbolicator-native/Cargo.toml index 823d1e7fd..c2f542270 100644 --- a/crates/symbolicator-native/Cargo.toml +++ b/crates/symbolicator-native/Cargo.toml @@ -25,7 +25,7 @@ symbolicator-service = { path = "../symbolicator-service" } symbolicator-sources = { path = "../symbolicator-sources" } tempfile = "3.2.0" thiserror = "1.0.31" -tokio = { version = "1.24.2" } +tokio = { workspace = true } tracing = "0.1.34" url = { version = "2.2.0", features = ["serde"] } @@ -34,4 +34,4 @@ insta = { version = "1.18.0", features = ["redactions", "yaml"] } serde_json = "1.0.81" symbolicator-test = { path = "../symbolicator-test" } test-assembler = "0.1.5" -tokio = { version = "1.24.2", features = ["rt", "macros", "fs"] } +tokio = { workspace = true, features = ["rt", "macros", "fs"] } diff --git a/crates/symbolicator-proguard/Cargo.toml b/crates/symbolicator-proguard/Cargo.toml index 46ef1f615..45bc587ae 100644 --- a/crates/symbolicator-proguard/Cargo.toml +++ b/crates/symbolicator-proguard/Cargo.toml @@ -20,4 +20,4 @@ tracing = "0.1.34" [dev-dependencies] insta = { version = "1.18.0", features = ["redactions", "yaml"] } symbolicator-test = { path = "../symbolicator-test" } -tokio = { version = "1.24.2", features = ["rt", "macros", "fs"] } +tokio = { workspace = true, features = ["rt", "macros", "fs"] } diff --git a/crates/symbolicator-service/Cargo.toml b/crates/symbolicator-service/Cargo.toml index fcaa73d50..08a8c63a7 100644 --- a/crates/symbolicator-service/Cargo.toml +++ b/crates/symbolicator-service/Cargo.toml @@ -41,8 +41,8 @@ symbolicator-sources = { path = "../symbolicator-sources" } tempfile = "3.2.0" thiserror = "1.0.31" thread_local = "1.1.7" -tokio = { version = "1.24.2", features = ["rt", "macros", "fs"] } -tokio-util = { version = "0.7.1", features = ["io"] } +tokio = { workspace = true, features = ["rt", "macros", "fs"] } +tokio-util = { workspace = true, features = ["io"] } tracing = "0.1.34" tracing-subscriber = { version = "0.3.17", features = ["env-filter", "time", "json"] } url = { version = "2.2.0", features = ["serde"] } diff --git a/crates/symbolicator-stress/Cargo.toml b/crates/symbolicator-stress/Cargo.toml index 491b65540..3d5b82835 100644 --- a/crates/symbolicator-stress/Cargo.toml +++ b/crates/symbolicator-stress/Cargo.toml @@ -21,7 +21,7 @@ symbolicator-proguard = { path = "../symbolicator-proguard" } symbolicator-service = { path = "../symbolicator-service" } symbolicator-test = { path = "../symbolicator-test" } tempfile = "3.2.0" -tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros", "time", "sync"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time", "sync"] } [target.'cfg(not(target_env = "msvc"))'.dependencies] jemallocator = { version = "0.5", features = ["unprefixed_malloc_on_supported_platforms"] } diff --git a/crates/symbolicator-test/Cargo.toml b/crates/symbolicator-test/Cargo.toml index aafe0d8ab..49e50e753 100644 --- a/crates/symbolicator-test/Cargo.toml +++ b/crates/symbolicator-test/Cargo.toml @@ -15,6 +15,6 @@ serde = { version = "1.0.137", features = ["derive", "rc"] } serde_json = "1.0.94" symbolicator-sources = { path = "../symbolicator-sources" } tempfile = "3.2.0" -tokio = { version = "1.26.0", features = ["rt", "macros", "fs"] } +tokio = { workspace = true, features = ["rt", "macros", "fs"] } tower-http = { version = "0.5.0", features = ["fs", "trace"] } tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } diff --git a/crates/symbolicator/Cargo.toml b/crates/symbolicator/Cargo.toml index 4f741b5b7..e40836d7c 100644 --- a/crates/symbolicator/Cargo.toml +++ b/crates/symbolicator/Cargo.toml @@ -29,9 +29,9 @@ symbolicator-service = { path = "../symbolicator-service" } symbolicator-sources = { path = "../symbolicator-sources" } tempfile = "3.2.0" thiserror = "1.0.31" -tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros", "fs"] } -tokio-metrics = "0.3.0" -tokio-util = { version = "0.7.1", features = ["io"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros", "fs"] } +tokio-metrics = { workspace = true } +tokio-util = { workspace = true, features = ["io"] } tower = "0.4" tower-layer = "0.3" tower-service = "0.3" diff --git a/crates/symbolicli/Cargo.toml b/crates/symbolicli/Cargo.toml index b1c422df4..d22320279 100644 --- a/crates/symbolicli/Cargo.toml +++ b/crates/symbolicli/Cargo.toml @@ -20,7 +20,7 @@ symbolicator-native = { path = "../symbolicator-native" } symbolicator-service = { path = "../symbolicator-service" } symbolicator-sources = { path = "../symbolicator-sources" } tempfile = "3.3.0" -tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros", "time", "sync"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time", "sync"] } toml = "0.8.0" tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }