From e03e82ce02bb5367f03870c34d4166e8dd1a15a7 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Tue, 21 May 2024 07:19:39 -0700 Subject: [PATCH 1/2] CI: select probe for on-target test --- .github/workflows/on-target.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/on-target.yml b/.github/workflows/on-target.yml index 1034607f..27999a3c 100644 --- a/.github/workflows/on-target.yml +++ b/.github/workflows/on-target.yml @@ -76,4 +76,5 @@ jobs: probe-rs run \ --chip STM32F070RBTx \ --connect-under-reset \ + --probe 0483:374b:066CFF504955857567220634 \ testsuite-bin/testsuite From 6fef9cc2b73c93e7751f9eec500c112565abab7d Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sun, 30 Jun 2024 12:15:02 -0700 Subject: [PATCH 2/2] MSRV: 1.60 -> 1.61 This aligns with the MSRV for syn --- .github/workflows/ci.yml | 2 +- .github/workflows/rt-ci.yml | 2 +- cortex-m-rt/CHANGELOG.md | 2 ++ cortex-m-rt/Cargo.toml | 2 +- cortex-m-rt/README.md | 2 +- cortex-m-rt/macros/Cargo.toml | 2 +- cortex-m-rt/src/lib.rs | 2 +- cortex-m-semihosting/Cargo.toml | 2 +- cortex-m-semihosting/README.md | 2 +- cortex-m/CHANGELOG.md | 1 + cortex-m/Cargo.toml | 2 +- cortex-m/README.md | 2 +- cortex-m/src/lib.rs | 2 +- panic-semihosting/Cargo.toml | 2 +- panic-semihosting/README.md | 2 +- 15 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6411e491..3d62c052 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: include: # Test MSRV - - rust: 1.60.0 + - rust: 1.61.0 # Test nightly but don't fail - rust: nightly diff --git a/.github/workflows/rt-ci.yml b/.github/workflows/rt-ci.yml index e3609ef0..b9a69a41 100644 --- a/.github/workflows/rt-ci.yml +++ b/.github/workflows/rt-ci.yml @@ -13,7 +13,7 @@ jobs: continue-on-error: ${{ matrix.experimental || false }} strategy: matrix: - rust: [nightly, stable, 1.60.0] + rust: [nightly, stable, 1.61.0] include: # Nightly is only for reference and allowed to fail diff --git a/cortex-m-rt/CHANGELOG.md b/cortex-m-rt/CHANGELOG.md index 2aa839c1..1075e0ad 100644 --- a/cortex-m-rt/CHANGELOG.md +++ b/cortex-m-rt/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +- MSRV is now Rust 1.61 to support syn verions >=2.0.68 + ## [v0.7.4] - Add `zero-init-ram` feature to initialize RAM with zeros on startup. diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml index e945bac2..984b6026 100644 --- a/cortex-m-rt/Cargo.toml +++ b/cortex-m-rt/Cargo.toml @@ -16,7 +16,7 @@ version = "0.7.4" autoexamples = true links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked edition = "2021" -rust-version = "1.60" +rust-version = "1.61" [dependencies] cortex-m-rt-macros = { path = "macros", version = "=0.7.0" } diff --git a/cortex-m-rt/README.md b/cortex-m-rt/README.md index 39d9ac8d..f832da80 100644 --- a/cortex-m-rt/README.md +++ b/cortex-m-rt/README.md @@ -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.60.0 and up. It *might* +This crate is guaranteed to compile on stable Rust 1.61.0 and up. It *might* compile with older versions but that may change in any new patch release. # License diff --git a/cortex-m-rt/macros/Cargo.toml b/cortex-m-rt/macros/Cargo.toml index 34b425fc..6a1b352a 100644 --- a/cortex-m-rt/macros/Cargo.toml +++ b/cortex-m-rt/macros/Cargo.toml @@ -9,7 +9,7 @@ name = "cortex-m-rt-macros" repository = "https://github.com/rust-embedded/cortex-m" version = "0.7.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" [lib] proc-macro = true diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs index 238240fe..4329119c 100644 --- a/cortex-m-rt/src/lib.rs +++ b/cortex-m-rt/src/lib.rs @@ -455,7 +455,7 @@ //! //! # Minimum Supported Rust Version (MSRV) //! -//! The MSRV of this release is Rust 1.60.0. +//! The MSRV of this release is Rust 1.61.0. // # Developer notes // diff --git a/cortex-m-semihosting/Cargo.toml b/cortex-m-semihosting/Cargo.toml index fe86dbf0..6b3b7762 100644 --- a/cortex-m-semihosting/Cargo.toml +++ b/cortex-m-semihosting/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" repository = "https://github.com/rust-embedded/cortex-m" version = "0.5.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" [features] jlink-quirks = [] diff --git a/cortex-m-semihosting/README.md b/cortex-m-semihosting/README.md index 12843968..fe242eb8 100644 --- a/cortex-m-semihosting/README.md +++ b/cortex-m-semihosting/README.md @@ -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.60.0 and up. It *might* +This crate is guaranteed to compile on stable Rust 1.61.0 and up. It *might* compile with older versions but that may change in any new patch release. ## License diff --git a/cortex-m/CHANGELOG.md b/cortex-m/CHANGELOG.md index 85efc02f..9a706fe9 100644 --- a/cortex-m/CHANGELOG.md +++ b/cortex-m/CHANGELOG.md @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Inline assembly is now always used, requiring Rust 1.59. +- Bumped MSRV to 1.61 for compatibility with syn versions >=2.0.68. ### Removed - removed all peripherals `ptr()` functions in favor of the associated constant `PTR` (#385). diff --git a/cortex-m/Cargo.toml b/cortex-m/Cargo.toml index 27228d5f..11bb9f6c 100644 --- a/cortex-m/Cargo.toml +++ b/cortex-m/Cargo.toml @@ -13,7 +13,7 @@ readme = "README.md" repository = "https://github.com/rust-embedded/cortex-m" version = "0.7.4" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" links = "cortex-m" # prevent multiple versions of this crate to be linked together [dependencies] diff --git a/cortex-m/README.md b/cortex-m/README.md index b11b91ec..4fe4c08f 100644 --- a/cortex-m/README.md +++ b/cortex-m/README.md @@ -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.60.0 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.61.0 and up. It might compile with older versions but that may change in any new patch release. ## License diff --git a/cortex-m/src/lib.rs b/cortex-m/src/lib.rs index f74fcbf7..b4ae0157 100644 --- a/cortex-m/src/lib.rs +++ b/cortex-m/src/lib.rs @@ -27,7 +27,7 @@ //! //! # Minimum Supported Rust Version (MSRV) //! -//! This crate is guaranteed to compile on stable Rust 1.60 and up. It *might* +//! This crate is guaranteed to compile on stable Rust 1.61 and up. It *might* //! compile with older versions but that may change in any new patch release. #![deny(missing_docs)] diff --git a/panic-semihosting/Cargo.toml b/panic-semihosting/Cargo.toml index 05c1eb57..1ebca984 100644 --- a/panic-semihosting/Cargo.toml +++ b/panic-semihosting/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0" name = "panic-semihosting" repository = "https://github.com/rust-embedded/cortex-m" version = "0.6.0" -rust-version = "1.60" +rust-version = "1.61" edition = "2021" [dependencies] diff --git a/panic-semihosting/README.md b/panic-semihosting/README.md index 7e70881c..86a38fae 100644 --- a/panic-semihosting/README.md +++ b/panic-semihosting/README.md @@ -8,7 +8,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.60.0 and up. It *might* +This crate is guaranteed to compile on stable Rust 1.61.0 and up. It *might* compile with older versions but that may change in any new patch release. ## License