Skip to content

Commit e15768d

Browse files
committed
bump MSRV to 1.59
1 parent fb33ee5 commit e15768d

File tree

7 files changed

+7
-25
lines changed

7 files changed

+7
-25
lines changed

.github/bors.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ delete_merged_branches = true
33
required_approvals = 1
44
status = [
55
"ci-linux (stable)",
6-
"ci-linux (1.38.0)",
6+
"ci-linux (1.59.0)",
77
"rustfmt",
88
"clippy",
99
]

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
include:
1919
# Test MSRV
20-
- rust: 1.38.0
20+
- rust: 1.59.0
2121
features: ""
2222

2323
# Test nightly but don't fail

Cargo.toml

+1-14
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,7 @@ features = [ "derive" ]
2828
optional = true
2929

3030
[dependencies.serde_json]
31-
version = ">=1.0.0,<=1.0.100"
32-
optional = true
33-
34-
35-
[dependencies.nb]
36-
version = "=0.1.2"
37-
optional = true
38-
39-
[dependencies.proc-macro2]
40-
version = "=1.0.65"
41-
optional = true
42-
43-
[dependencies.serde_derive]
44-
version = "=1.0.156"
31+
version = "1"
4532
optional = true
4633

4734
[features]

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This project is developed and maintained by the [Cortex-M team][team].
1111

1212
## Minimum Supported Rust Version (MSRV)
1313

14-
This crate is guaranteed to compile on stable Rust 1.38 and up. It might compile with older versions but that may change in any new patch release.
14+
This crate is guaranteed to compile on stable Rust 1.59 and up. It might compile with older versions but that may change in any new patch release.
1515

1616
## License
1717

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
//!
6464
//! # Minimum Supported Rust Version (MSRV)
6565
//!
66-
//! This crate is guaranteed to compile on stable Rust 1.38 and up. It *might*
66+
//! This crate is guaranteed to compile on stable Rust 1.59 and up. It *might*
6767
//! compile with older versions but that may change in any new patch release.
6868
6969
#![deny(missing_docs)]

src/peripheral/scb.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,7 @@ impl SCB {
173173
let icsr = unsafe { ptr::read(&(*SCB::PTR).icsr as *const _ as *const u32) };
174174

175175
// NOTE(unsafe): Assume correctly selected target.
176-
match VectActive::from(icsr as u8) {
177-
Some(val) => val,
178-
None => unsafe { core::hint::unreachable_unchecked() },
179-
}
176+
unsafe { VectActive::from(icsr as u8).unwrap_unchecked() }
180177
}
181178
}
182179

xtask/tests/ci.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ fn check_crates_build(is_nightly: bool, is_msrv: bool) {
5858
// Relies on all crates in this repo to use the same convention.
5959
let should_use_feature = |feat: &str| {
6060
match feat {
61-
// critical-section doesn't build in 1.38 due to using `#[doc(include_str!(..))]`
62-
"critical-section-single-core" => !is_msrv,
6361
// This is nightly-only, so don't use it on stable.
6462
"inline-asm" => is_nightly,
6563
// This only affects thumbv7em targets.
@@ -105,7 +103,7 @@ fn main() {
105103

106104
let output = Command::new("rustc").arg("-V").output().unwrap();
107105
let is_nightly = str::from_utf8(&output.stdout).unwrap().contains("nightly");
108-
let is_msrv = str::from_utf8(&output.stdout).unwrap().contains("1.38");
106+
let is_msrv = str::from_utf8(&output.stdout).unwrap().contains("1.59");
109107

110108
check_crates_build(is_nightly, is_msrv);
111109

0 commit comments

Comments
 (0)