Merge pull request #628 from wt/update_msrv

Update msrv

Author: adamgreig

.github/workflows/ci.yml

@@ -17,22 +17,15 @@ jobs:
 
         include:
           # Test MSRV
-          - rust: 1.71.0
-            # Should be set to true for >= 1.81.0
-            test_cortex_m_types: false
+          - rust: 1.85.0
 
           # Test nightly but don't fail
           - rust: nightly
-            test_cortex_m_types: true
             experimental: true
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
       - name: Run tests
-        if: ${{ matrix.test_cortex_m_types }}
         run: cargo test --all --exclude cortex-m-rt --exclude testsuite --features cortex-m/critical-section-single-core
-      - name: Run tests for < 1.81.0 (need to exclude cortex-m-types)
-        if: ${{ matrix.test_cortex_m_types == false }}
-        run: cargo test --all --exclude cortex-m-rt --exclude testsuite --exclude cortex-m-types --features cortex-m/critical-section-single-core

.github/workflows/clippy.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.81
+      - uses: dtolnay/rust-toolchain@1.85
         with:
           components: clippy
       - run: cargo clippy --all --features cortex-m/critical-section-single-core -- --deny warnings

.github/workflows/rt-ci.yml

@@ -11,7 +11,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental || false }}
     strategy:
       matrix:
-        rust: [nightly, stable, 1.71.0]
+        rust: [nightly, stable, 1.85.0]
 
         include:
           # Nightly is only for reference and allowed to fail

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "cortex-m",
     "cortex-m-types",

cortex-m-rt/CHANGELOG.md

@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   from an external device. Note that this relies on the bootloader to have already
   copied `.data` to the VMA before relinquishing control.
 - Updated references from 'Cortex-M Team' to 'Arm Team'
-- Bump MSRV to 1.71
+- Bump MSRV to 1.85
 
 ## [v0.7.5]
 

cortex-m-rt/Cargo.toml

@@ -1,9 +1,4 @@
 [package]
-authors = [
-    "The Embedded Devices Working Group's Arm Team <cortex-m@teams.rust-embedded.org>",
-    "Jorge Aparicio <jorge@japaric.io>",
-    "Hideki Sekine <sekineh@me.com>",
-]
 categories = ["embedded", "no-std"]
 description = "Minimal runtime / startup for Cortex-M microcontrollers"
 documentation = "https://docs.rs/cortex-m-rt/"
@@ -15,8 +10,8 @@ repository = "https://github.com/rust-embedded/cortex-m"
 version = "0.7.5"
 autoexamples = true
 links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked
-edition = "2021"
-rust-version = "1.71"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
 cortex-m-rt-macros = { path = "macros", version = "=0.7.5" }

cortex-m-rt/README.md

@@ -11,7 +11,7 @@ This project is developed and maintained by the [Embedded Devices Working Group'
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.61.0 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.85 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 ## License

cortex-m-rt/examples/device.rs

@@ -1,6 +1,5 @@
 //! Manually create the interrupts portion of the vector table
 
-#![deny(unsafe_code)]
 #![deny(warnings)]
 #![no_main]
 #![no_std]
@@ -22,14 +21,14 @@ pub union Vector {
     reserved: usize,
 }
 
-extern "C" {
+unsafe extern "C" {
     fn WWDG();
     fn PVD();
 }
 
 #[allow(unsafe_code)]
-#[link_section = ".vector_table.interrupts"]
-#[no_mangle]
+#[unsafe(link_section = ".vector_table.interrupts")]
+#[unsafe(no_mangle)]
 pub static __INTERRUPTS: [Vector; 3] = [
     Vector { handler: WWDG },
     Vector { reserved: 0 },

cortex-m-rt/examples/hard-fault-trampoline.rs

@@ -10,7 +10,7 @@ extern crate cortex_m_rt;
 extern crate panic_halt;
 
 use core::arch::asm;
-use cortex_m_rt::{entry, exception, ExceptionFrame};
+use cortex_m_rt::{ExceptionFrame, entry, exception};
 
 // This defines both `HardFault` and `_HardFault`. Both should have
 // link_section attributes placing them at the end of the .text section,

cortex-m-rt/examples/main.rs

@@ -7,7 +7,7 @@
 extern crate cortex_m_rt as rt;
 extern crate panic_halt;
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn main() -> ! {
     loop {}
 }