Skip to content

Commit

Permalink
bump MSRV to 1.59
Browse files Browse the repository at this point in the history
  • Loading branch information
skibon02 committed Jan 19, 2024
1 parent fb33ee5 commit e15768d
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ delete_merged_branches = true
required_approvals = 1
status = [
"ci-linux (stable)",
"ci-linux (1.38.0)",
"ci-linux (1.59.0)",
"rustfmt",
"clippy",
]
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

include:
# Test MSRV
- rust: 1.38.0
- rust: 1.59.0
features: ""

# Test nightly but don't fail
Expand Down
15 changes: 1 addition & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,7 @@ features = [ "derive" ]
optional = true

[dependencies.serde_json]
version = ">=1.0.0,<=1.0.100"
optional = true


[dependencies.nb]
version = "=0.1.2"
optional = true

[dependencies.proc-macro2]
version = "=1.0.65"
optional = true

[dependencies.serde_derive]
version = "=1.0.156"
version = "1"
optional = true

[features]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This project is developed and maintained by the [Cortex-M team][team].

## Minimum Supported Rust Version (MSRV)

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.
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.

## License

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
//!
//! # Minimum Supported Rust Version (MSRV)
//!
//! This crate is guaranteed to compile on stable Rust 1.38 and up. It *might*
//! 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.

#![deny(missing_docs)]
Expand Down
5 changes: 1 addition & 4 deletions src/peripheral/scb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,7 @@ impl SCB {
let icsr = unsafe { ptr::read(&(*SCB::PTR).icsr as *const _ as *const u32) };

// NOTE(unsafe): Assume correctly selected target.
match VectActive::from(icsr as u8) {
Some(val) => val,
None => unsafe { core::hint::unreachable_unchecked() },
}
unsafe { VectActive::from(icsr as u8).unwrap_unchecked() }
}
}

Expand Down
4 changes: 1 addition & 3 deletions xtask/tests/ci.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ fn check_crates_build(is_nightly: bool, is_msrv: bool) {
// Relies on all crates in this repo to use the same convention.
let should_use_feature = |feat: &str| {
match feat {
// critical-section doesn't build in 1.38 due to using `#[doc(include_str!(..))]`
"critical-section-single-core" => !is_msrv,
// This is nightly-only, so don't use it on stable.
"inline-asm" => is_nightly,
// This only affects thumbv7em targets.
Expand Down Expand Up @@ -105,7 +103,7 @@ fn main() {

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

check_crates_build(is_nightly, is_msrv);

Expand Down

0 comments on commit e15768d

Please sign in to comment.