diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5bdec535..8d19ec863 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: target: - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu } version: - - { name: msrv, version: 1.82.0 } + - { name: msrv, version: 1.85.0 } - { name: stable, version: stable } name: ${{ matrix.target.name }} / ${{ matrix.version.name }} @@ -90,7 +90,7 @@ jobs: - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin } - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc } version: - - { name: msrv, version: 1.82.0 } + - { name: msrv, version: 1.85.0 } - { name: stable, version: stable } name: ${{ matrix.target.name }} / ${{ matrix.version.name }} diff --git a/Cargo.lock b/Cargo.lock index 4852b9935..fe7eb1297 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -127,7 +127,7 @@ dependencies = [ "chrono", "derive_more", "log", - "redis", + "redis 1.0.2", "static_assertions", "time", "uuid", @@ -219,7 +219,7 @@ dependencies = [ "deadpool-redis", "derive_more", "rand 0.9.2", - "redis", + "redis 1.0.2", "serde", "serde_json", "tracing", @@ -533,6 +533,12 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" +[[package]] +name = "arcstr" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03918c3dbd7701a85c6b9887732e2921175f26c350b4563841d0958c21d57e6d" + [[package]] name = "async-trait" version = "0.1.89" @@ -591,9 +597,9 @@ dependencies = [ [[package]] name = "backon" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592277618714fbcecda9a02ba7a8781f319d26532a88553bbacc77ba5d2b3a8d" +checksum = "cffb0e931875b666fc4fcb20fee52e9bbd1ef836fd9e9e04ec21555f9f85f7ef" dependencies = [ "fastrand", ] @@ -909,7 +915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb4d00bce7a9cfd07ded19530621a7df17c4c3b1c4e8fc2262471de404ce539a" dependencies = [ "deadpool", - "redis", + "redis 0.32.7", ] [[package]] @@ -2859,8 +2865,30 @@ name = "redis" version = "0.32.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "014cc767fefab6a3e798ca45112bccad9c6e0e218fbd49720042716c73cfef44" +dependencies = [ + "bytes", + "cfg-if", + "combine", + "futures-util", + "itoa", + "num-bigint", + "percent-encoding", + "pin-project-lite", + "ryu", + "socket2 0.6.1", + "tokio", + "tokio-util", + "url", +] + +[[package]] +name = "redis" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfe20977fe93830c0e9817a16fbf1ed1cfd8d4bba366087a1841d2c6033c251" dependencies = [ "arc-swap", + "arcstr", "backon", "bytes", "cfg-if", @@ -2869,7 +2897,6 @@ dependencies = [ "futures-util", "itoa", "native-tls", - "num-bigint", "percent-encoding", "pin-project-lite", "rustls", @@ -2881,6 +2908,7 @@ dependencies = [ "tokio-rustls", "tokio-util", "url", + "xxhash-rust", ] [[package]] @@ -4583,6 +4611,12 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +[[package]] +name = "xxhash-rust" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" + [[package]] name = "yoke" version = "0.8.0" diff --git a/Cargo.toml b/Cargo.toml index ef255a9a1..5580f8d4f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ repository = "https://github.com/actix/actix-extras" homepage = "https://actix.rs" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.82" +rust-version = "1.85" [workspace.lints.rust] rust-2018-idioms = { level = "deny" } diff --git a/actix-cors/CHANGES.md b/actix-cors/CHANGES.md index 9c7e8c170..6e8a61382 100644 --- a/actix-cors/CHANGES.md +++ b/actix-cors/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Minimum supported Rust version (MSRV) is now 1.82. +- Minimum supported Rust version (MSRV) is now 1.85. ## 0.7.1 diff --git a/actix-cors/README.md b/actix-cors/README.md index 0e6bf5064..5795c16fb 100644 --- a/actix-cors/README.md +++ b/actix-cors/README.md @@ -4,7 +4,7 @@ [![crates.io](https://img.shields.io/crates/v/actix-cors?label=latest)](https://crates.io/crates/actix-cors) [![Documentation](https://docs.rs/actix-cors/badge.svg?version=0.7.1)](https://docs.rs/actix-cors/0.7.1) -![Version](https://img.shields.io/badge/rustc-1.82+-ab6000.svg) +![Version](https://img.shields.io/badge/rustc-1.85+-ab6000.svg) ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-cors.svg)
[![Dependency Status](https://deps.rs/crate/actix-cors/0.7.1/status.svg)](https://deps.rs/crate/actix-cors/0.7.1) @@ -69,4 +69,4 @@ async fn main() -> std::io::Result<()> { - [API Documentation](https://docs.rs/actix-cors) - [Example Project](https://github.com/actix/examples/tree/main/cors) -- Minimum Supported Rust Version (MSRV): 1.82 +- Minimum Supported Rust Version (MSRV): 1.85 diff --git a/actix-identity/CHANGES.md b/actix-identity/CHANGES.md index d35524f01..455e33611 100644 --- a/actix-identity/CHANGES.md +++ b/actix-identity/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Minimum supported Rust version (MSRV) is now 1.82. +- Minimum supported Rust version (MSRV) is now 1.85. ## 0.9.0 diff --git a/actix-limitation/CHANGES.md b/actix-limitation/CHANGES.md index 48269eb6f..c98376819 100644 --- a/actix-limitation/CHANGES.md +++ b/actix-limitation/CHANGES.md @@ -4,7 +4,7 @@ - Update `redis` dependency to `0.32`. - Update `actix-session` dependency to `0.11`. -- Minimum supported Rust version (MSRV) is now 1.82. +- Minimum supported Rust version (MSRV) is now 1.85. ## 0.5.1 diff --git a/actix-limitation/Cargo.toml b/actix-limitation/Cargo.toml index 708acd8e7..691beda20 100644 --- a/actix-limitation/Cargo.toml +++ b/actix-limitation/Cargo.toml @@ -27,7 +27,7 @@ actix-web = { version = "4", default-features = false, features = ["cookies"] } chrono = "0.4" derive_more = { version = "2", features = ["display", "error", "from"] } log = "0.4" -redis = { version = "0.32", default-features = false, features = ["tokio-comp"] } +redis = { version = "1.0", default-features = false, features = ["tokio-comp"] } time = "0.3" # session diff --git a/actix-limitation/src/lib.rs b/actix-limitation/src/lib.rs index cc54c4b4b..36dc0b076 100644 --- a/actix-limitation/src/lib.rs +++ b/actix-limitation/src/lib.rs @@ -137,7 +137,7 @@ impl Limiter { let key = key.into(); let expires = self.period.as_secs(); - let mut connection = self.client.get_multiplexed_tokio_connection().await?; + let mut connection = self.client.get_multiplexed_async_connection().await?; // The seed of this approach is outlined Atul R in a blog post about rate limiting using // NodeJS and Redis. For more details, see https://blog.atulr.com/rate-limiter diff --git a/actix-protobuf/CHANGES.md b/actix-protobuf/CHANGES.md index 64903be5b..09abdff2a 100644 --- a/actix-protobuf/CHANGES.md +++ b/actix-protobuf/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Minimum supported Rust version (MSRV) is now 1.82. +- Minimum supported Rust version (MSRV) is now 1.85. ## 0.11.0 diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index 886c8c82b..ea9d49c3a 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -3,7 +3,7 @@ ## Unreleased - `Session` implementation of `FromRequest` now errors with `Infallible` rather than `actix_web::error::Error`. -- Minimum supported Rust version (MSRV) is now 1.82. +- Minimum supported Rust version (MSRV) is now 1.85. ## 0.11.0 diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index 9fd4430b6..fbada17df 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -37,7 +37,7 @@ serde_json = { version = "1" } tracing = { version = "0.1.44", default-features = false, features = ["log"] } # redis-session -redis = { version = "0.32", default-features = false, features = ["tokio-comp", "connection-manager"], optional = true } +redis = { version = "1.0", default-features = false, features = ["tokio-comp", "connection-manager"], optional = true } deadpool-redis = { version = "0.22", optional = true } [dev-dependencies] diff --git a/actix-settings/CHANGES.md b/actix-settings/CHANGES.md index 4b713e9bb..15d2d99eb 100644 --- a/actix-settings/CHANGES.md +++ b/actix-settings/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.82. + ## 0.9.0 - Update `toml` dependency to `0.9`. diff --git a/actix-web-httpauth/CHANGES.md b/actix-web-httpauth/CHANGES.md index fd49d121d..5e347c208 100644 --- a/actix-web-httpauth/CHANGES.md +++ b/actix-web-httpauth/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Minimum supported Rust version (MSRV) is now 1.82. +- Minimum supported Rust version (MSRV) is now 1.85. ## 0.8.2 diff --git a/actix-ws/README.md b/actix-ws/README.md index 1ccbe7d0e..d8138ab74 100644 --- a/actix-ws/README.md +++ b/actix-ws/README.md @@ -6,7 +6,7 @@ [![crates.io](https://img.shields.io/crates/v/actix-ws?label=latest)](https://crates.io/crates/actix-ws) [![Documentation](https://docs.rs/actix-ws/badge.svg?version=0.3.0)](https://docs.rs/actix-ws/0.3.0) -![Version](https://img.shields.io/badge/rustc-1.82+-ab6000.svg) +![Version](https://img.shields.io/badge/rustc-1.85+-ab6000.svg) ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-ws.svg)
[![Dependency Status](https://deps.rs/crate/actix-ws/0.3.0/status.svg)](https://deps.rs/crate/actix-ws/0.3.0) @@ -62,7 +62,7 @@ async fn main() -> std::io::Result<()> { - [API Documentation](https://docs.rs/actix-ws) - [Example Chat Project](https://github.com/actix/examples/tree/main/websockets/chat-actorless) -- Minimum Supported Rust Version (MSRV): 1.82 +- Minimum Supported Rust Version (MSRV): 1.85 ## License diff --git a/deny.toml b/deny.toml index 1a4da7f38..65385810d 100644 --- a/deny.toml +++ b/deny.toml @@ -7,6 +7,7 @@ allow = [ "BSD-3-Clause", "Zlib", "ISC", + "BSL-1.0", ] private = { ignore = true } diff --git a/justfile b/justfile index d2bc8cb5e..d67d098bb 100644 --- a/justfile +++ b/justfile @@ -48,10 +48,6 @@ test: # Downgrade dev-dependencies necessary to run MSRV checks/tests. [private] downgrade-for-msrv: - cargo {{ toolchain }} update -p=idna_adapter --precise=1.2.0 # next ver: 1.82.0 - cargo {{ toolchain }} update -p=litemap --precise=0.7.4 # next ver: 1.81.0 - cargo {{ toolchain }} update -p=zerofrom --precise=0.1.5 # next ver: 1.81.0 - cargo {{ toolchain }} update -p=time --precise=0.3.41 # next ver: 1.81.0 # Test workspace using MSRV. [group("test")] diff --git a/tracing-actix-web/Cargo.toml b/tracing-actix-web/Cargo.toml index be4a50669..6074bdc4d 100644 --- a/tracing-actix-web/Cargo.toml +++ b/tracing-actix-web/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/actix/actix-extras" homepage = "https://actix.rs" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.82" +rust-version = "1.85" [features] default = ["emit_event_on_error"]