Skip to content

Commit 03b0192

Browse files
authored
Merge pull request #464 from Amanieu/ci-msrv
2 parents 87ce756 + 597621a commit 03b0192

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

.github/workflows/rust.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,8 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu, macos, windows]
20-
channel: [1.56.0, stable, beta, nightly]
20+
channel: [stable, beta, nightly]
2121
feature: [arc_lock, serde, deadlock_detection]
22-
exclude:
23-
- feature: deadlock_detection
24-
channel: '1.56.0'
25-
# Versions before 1.54 fail to build on the latest XCode.
26-
- os: macos
27-
channel: '1.56.0'
2822
include:
2923
- channel: nightly
3024
feature: nightly
@@ -41,15 +35,17 @@ jobs:
4135
- run: cargo build --all --features ${{ matrix.feature }}
4236
- run: cargo test --all --features ${{ matrix.feature }}
4337
if: matrix.feature == 'nightly'
38+
- run: cargo install cargo-msrv
39+
- run: cargo msrv --workspace verify
4440
build_other_platforms:
4541
runs-on: ubuntu-latest
4642
strategy:
4743
matrix:
4844
target:
4945
- wasm32-unknown-unknown
5046
- x86_64-fortanix-unknown-sgx
51-
#- x86_64-unknown-redox
52-
#- x86_64-linux-android
47+
- x86_64-unknown-redox
48+
- x86_64-linux-android
5349
steps:
5450
- uses: actions/checkout@v4
5551
- run: rustup default nightly

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ readme = "README.md"
99
keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
1010
categories = ["concurrency"]
1111
edition = "2021"
12-
rust-version = "1.56"
12+
rust-version = "1.64"
1313

1414
[package.metadata.docs.rs]
1515
features = ["arc_lock", "serde", "deadlock_detection"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ changes to the core API do not cause breaking changes for users of `parking_lot`
132132

133133
## Minimum Rust version
134134

135-
The current minimum required Rust version is 1.56. Any change to this is
135+
The current minimum required Rust version is 1.64. Any change to this is
136136
considered a breaking change and will require a major version bump.
137137

138138
## License

core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/Amanieu/parking_lot"
88
keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
99
categories = ["concurrency"]
1010
edition = "2021"
11-
rust-version = "1.56.0"
11+
rust-version = "1.64.0"
1212

1313
[package.metadata.docs.rs]
1414
rustdoc-args = ["--generate-link-to-definition"]

lock_api/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/Amanieu/parking_lot"
88
keywords = ["mutex", "rwlock", "lock", "no_std"]
99
categories = ["concurrency", "no-std"]
1010
edition = "2021"
11-
rust-version = "1.56.0"
11+
rust-version = "1.64.0"
1212

1313
[package.metadata.docs.rs]
1414
all-features = true

0 commit comments

Comments
 (0)