diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index e27a2fe8..1ce0fef6 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -85,7 +85,7 @@ jobs: - name: tests if: matrix.target.os != 'ubuntu-latest' - run: just test-code + run: just test - name: tests if: matrix.target.os == 'ubuntu-latest' run: >- diff --git a/Cargo.toml b/Cargo.toml index ae46b5d7..c130eaf9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ members = [ [workspace.package] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" [patch.crates-io] actix-codec = { path = "actix-codec" } diff --git a/actix-codec/CHANGES.md b/actix-codec/CHANGES.md index 61db9714..fa2bfddd 100644 --- a/actix-codec/CHANGES.md +++ b/actix-codec/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.70. + ## 0.5.2 - Minimum supported Rust version (MSRV) is now 1.65. diff --git a/actix-macros/CHANGES.md b/actix-macros/CHANGES.md index 570c4e1e..99ecfa97 100644 --- a/actix-macros/CHANGES.md +++ b/actix-macros/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.70. + ## 0.2.4 - Update `syn` dependency to `2`. diff --git a/actix-macros/Cargo.toml b/actix-macros/Cargo.toml index b96daeb9..925721ea 100644 --- a/actix-macros/Cargo.toml +++ b/actix-macros/Cargo.toml @@ -33,5 +33,6 @@ proc-macro2 = "1.0.60" actix-rt = "2" futures-util = { version = "0.3.17", default-features = false } -rustversion = "1" +# rustversion = "1" +rustversion = { path = "/Users/rob/Development/forks/rustversion" } trybuild = "1" diff --git a/actix-macros/tests/trybuild.rs b/actix-macros/tests/trybuild.rs index b37b84ba..ab425d6d 100644 --- a/actix-macros/tests/trybuild.rs +++ b/actix-macros/tests/trybuild.rs @@ -1,4 +1,4 @@ -#[rustversion::stable(1.65)] // MSRV +#[rustversion::stable(1.70)] // MSRV #[test] fn compile_macros() { let t = trybuild::TestCases::new(); diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md index 6a6b18b4..1535612b 100644 --- a/actix-rt/CHANGES.md +++ b/actix-rt/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.70. + ## 2.9.0 - Add `actix_rt::System::runtime()` method to retrieve the underlying `actix_rt::Runtime` runtime. diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md index 4a0dd3d6..ce4c6b27 100644 --- a/actix-server/CHANGES.md +++ b/actix-server/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.70. + ## 2.3.0 - Add support for MultiPath TCP (MPTCP) with `MpTcp` enum and `ServerBuilder::mptcp()` method. diff --git a/actix-service/CHANGES.md b/actix-service/CHANGES.md index 9a3b70a3..0ef39dc1 100644 --- a/actix-service/CHANGES.md +++ b/actix-service/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Minimum supported Rust version (MSRV) is now 1.65. +- Minimum supported Rust version (MSRV) is now 1.70. ## 2.0.2 diff --git a/actix-tls/CHANGES.md b/actix-tls/CHANGES.md index 57932a30..3a5dafae 100644 --- a/actix-tls/CHANGES.md +++ b/actix-tls/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.70. + ## 3.3.0 - Add `rustls-0_22` create feature which excludes any root certificate methods or re-exports. diff --git a/actix-tracing/CHANGES.md b/actix-tracing/CHANGES.md index 2e90e25c..15f1437a 100644 --- a/actix-tracing/CHANGES.md +++ b/actix-tracing/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Minimum supported Rust version (MSRV) is now 1.65. +- Minimum supported Rust version (MSRV) is now 1.70. ## 0.1.0 diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md index c68c3171..de510788 100644 --- a/actix-utils/CHANGES.md +++ b/actix-utils/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased -- Minimum supported Rust version (MSRV) is now 1.65. +- Minimum supported Rust version (MSRV) is now 1.70. ## 3.0.1 diff --git a/bytestring/CHANGES.md b/bytestring/CHANGES.md index 368ead4d..8a24680f 100644 --- a/bytestring/CHANGES.md +++ b/bytestring/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.70. + ## 1.3.1 - No significant changes since `1.3.0`. diff --git a/justfile b/justfile index f17a6f67..c970a73c 100644 --- a/justfile +++ b/justfile @@ -14,7 +14,7 @@ downgrade-for-msrv: msrv := ``` cargo metadata --format-version=1 \ - | jq -r 'first(.packages[] | .name = "actix-tls") | .rust_version' + | jq -r 'first(.packages[] | select(.source == null and .name == "actix-tls")) | .rust_version' ``` msrv_full := msrv + ".0" # comment out if the MSRV has a patch version specified msrv_rustup := "+" + msrv_full diff --git a/local-channel/CHANGES.md b/local-channel/CHANGES.md index 3244f033..602d09b3 100644 --- a/local-channel/CHANGES.md +++ b/local-channel/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.70. + ## 0.1.5 - No significant changes since `0.1.4`. diff --git a/local-waker/CHANGES.md b/local-waker/CHANGES.md index c83d06d4..a6adfbba 100644 --- a/local-waker/CHANGES.md +++ b/local-waker/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +- Minimum supported Rust version (MSRV) is now 1.70. + ## 0.1.4 - Minimum supported Rust version (MSRV) is now 1.65.