diff --git a/Cargo.lock b/Cargo.lock index 92f1464b5..8f2f4b61a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5044,7 +5044,6 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.8", ] [[package]] diff --git a/crates/ecstore/Cargo.toml b/crates/ecstore/Cargo.toml index 3c82d6156..c08f0a248 100644 --- a/crates/ecstore/Cargo.toml +++ b/crates/ecstore/Cargo.toml @@ -103,7 +103,7 @@ hex-simd = { workspace = true } tempfile.workspace = true hyper = { workspace = true, features = ["http2", "http1", "server"] } hyper-util = { workspace = true, features = ["tokio", "server-auto", "server-graceful", "tracing"] } -hyper-rustls = { workspace = true, default-features = false, features = ["native-tokio", "http1", "tls12", "logging", "http2", "aws-lc-rs", "webpki-roots"] } +hyper-rustls = { workspace = true, default-features = false, features = ["native-tokio", "http1", "tls12", "logging", "http2", "aws-lc-rs"] } rustls = { workspace = true, default-features = false, features = ["aws-lc-rs", "logging", "tls12", "prefer-post-quantum", "std"] } rustls-pki-types.workspace = true tokio = { workspace = true, features = ["io-util", "sync", "signal", "fs", "rt-multi-thread"] } diff --git a/crates/protocols/Cargo.toml b/crates/protocols/Cargo.toml index 7d1b69356..2323a1d0e 100644 --- a/crates/protocols/Cargo.toml +++ b/crates/protocols/Cargo.toml @@ -67,7 +67,7 @@ rustfs-storage-api = { workspace = true } rustfs-tls-runtime = { workspace = true, optional = true } # Async dependencies -tokio = { workspace = true, features = ["fs", "io-util", "sync", "time", "rt-multi-thread"] } +tokio = { workspace = true, features = ["fs", "io-util", "net", "rt", "sync", "time"] } tracing = { workspace = true } futures-util = { workspace = true } @@ -131,7 +131,7 @@ socket2 = { workspace = true, optional = true, features = ["all"] } tempfile = { workspace = true } proptest = "1" tracing-subscriber = { workspace = true, features = ["env-filter", "time"] } -tokio = { workspace = true, features = ["test-util", "macros", "fs", "rt-multi-thread"] } +tokio = { workspace = true, features = ["test-util", "macros", "fs"] } [package.metadata.docs.rs] all-features = true diff --git a/crates/replication/Cargo.toml b/crates/replication/Cargo.toml index 0e8127ed2..5dc9a1108 100644 --- a/crates/replication/Cargo.toml +++ b/crates/replication/Cargo.toml @@ -34,7 +34,7 @@ rmp-serde.workspace = true s3s = { workspace = true, features = ["minio"] } serde = { workspace = true, features = ["derive"] } time = { workspace = true, features = ["parsing", "formatting", "macros", "serde"] } -tokio = { workspace = true, features = ["sync", "fs", "rt-multi-thread"] } +tokio = { workspace = true, features = ["sync"] } url.workspace = true uuid = { workspace = true, features = ["v4", "serde", "fast-rng", "macro-diagnostics"] } diff --git a/crates/targets/Cargo.toml b/crates/targets/Cargo.toml index fed463e45..a26a156e6 100644 --- a/crates/targets/Cargo.toml +++ b/crates/targets/Cargo.toml @@ -19,9 +19,9 @@ rustfs-s3-types = { workspace = true } rustfs-utils = { workspace = true, features = ["egress"] } async-trait = { workspace = true } async-nats = { workspace = true } -deadpool-postgres = { workspace = true, features = ["rt_tokio_1"] } +deadpool-postgres = { workspace = true } hyper = { workspace = true, features = ["http2", "http1", "server"] } -hyper-rustls = { workspace = true, default-features = false, features = ["native-tokio", "http1", "tls12", "logging", "http2", "aws-lc-rs", "webpki-roots"] } +hyper-rustls = { workspace = true, default-features = false, features = ["native-tokio", "tls12", "logging", "aws-lc-rs"] } lapin = { workspace = true, default-features = false, features = ["tokio", "rustls", "rustls--aws_lc_rs"] } libc = { workspace = true } pulsar = { workspace = true, default-features = false, features = ["tokio-rustls-runtime", "telemetry"] } diff --git a/crates/tls-runtime/Cargo.toml b/crates/tls-runtime/Cargo.toml index 1a1763d31..fba5f3fc2 100644 --- a/crates/tls-runtime/Cargo.toml +++ b/crates/tls-runtime/Cargo.toml @@ -37,14 +37,14 @@ rustls-pki-types.workspace = true serde = { workspace = true, features = ["derive"] } sha2.workspace = true thiserror.workspace = true -tokio = { workspace = true, features = ["fs", "rt-multi-thread", "sync", "time"] } +tokio = { workspace = true, features = ["fs", "rt", "sync", "time"] } tracing.workspace = true [dev-dependencies] rcgen.workspace = true serde_json = { workspace = true, features = ["raw_value"] } tempfile.workspace = true -tokio = { workspace = true, features = ["macros", "rt-multi-thread", "fs"] } +tokio = { workspace = true, features = ["macros", "rt", "fs"] } [lib] doctest = false diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 1ac83cb88..1fa2633ce 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -50,7 +50,7 @@ convert_case = { workspace = true, optional = true } siphasher = { workspace = true, optional = true } snap = { workspace = true, optional = true } tempfile = { workspace = true, optional = true } -tokio = { workspace = true, optional = true, features = ["io-util", "macros", "fs", "rt-multi-thread"] } +tokio = { workspace = true, optional = true, features = ["io-util", "time"] } tracing = { workspace = true } transform-stream = { workspace = true, optional = true } url = { workspace = true, optional = true } @@ -58,7 +58,7 @@ zstd = { workspace = true, optional = true } [dev-dependencies] tempfile = { workspace = true } -tokio = { workspace = true, features = ["macros", "rt-multi-thread", "fs"] } +tokio = { workspace = true, features = ["macros", "rt"] } temp-env = { workspace = true } proptest = "1" diff --git a/crates/utils/src/compress.rs b/crates/utils/src/compress.rs index e520722f6..ab85e7eb0 100644 --- a/crates/utils/src/compress.rs +++ b/crates/utils/src/compress.rs @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::io::Write; +use std::io::{self, Write}; use std::{fmt, str}; -use tokio::io; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)] pub enum CompressionAlgorithm {