Skip to content

Commit 335c8c2

Browse files
authored
Merge pull request #504 from newAM/eh1
cortex-m: add support for embedded-hal 1.0 delays
2 parents 6df9a38 + ec6b3ba commit 335c8c2

File tree

17 files changed

+58
-23
lines changed

17 files changed

+58
-23
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
include:
2020
# Test MSRV
21-
- rust: 1.59.0
21+
- rust: 1.60.0
2222

2323
# Test nightly but don't fail
2424
- rust: nightly

.github/workflows/rt-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
continue-on-error: ${{ matrix.experimental || false }}
1414
strategy:
1515
matrix:
16-
rust: [nightly, stable, 1.59.0]
16+
rust: [nightly, stable, 1.60.0]
1717

1818
include:
1919
# Nightly is only for reference and allowed to fail

cortex-m-rt/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1010
- Add `zero-init-ram` feature to initialize RAM with zeros on startup. This can be necessary on
1111
safety-critical hardware to properly initialize memory integrity measures.
1212
- Add optional `exception` argument for `HardFault`. It has one option `trampoline` which is true by default. When set to false, no trampoline will be created and the function will be called as the exception handler directly.
13+
- MSRV increased to 1.60.0 to align with `embedded-hal` version 1.
1314

1415
## [v0.7.3]
1516

cortex-m-rt/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ version = "0.7.3"
1616
autoexamples = true
1717
links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked
1818
edition = "2021"
19-
rust-version = "1.59"
19+
rust-version = "1.60"
2020

2121
[dependencies]
2222
cortex-m-rt-macros = { path = "macros", version = "=0.7.0" }

cortex-m-rt/README.md

Lines changed: 1 addition & 1 deletion
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.59.0 and up. It *might*
14+
This crate is guaranteed to compile on stable Rust 1.60.0 and up. It *might*
1515
compile with older versions but that may change in any new patch release.
1616

1717
# License

cortex-m-rt/macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name = "cortex-m-rt-macros"
99
repository = "https://github.com/rust-embedded/cortex-m"
1010
version = "0.7.0"
1111
edition = "2021"
12-
rust-version = "1.59"
12+
rust-version = "1.60"
1313

1414
[lib]
1515
proc-macro = true

cortex-m-rt/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
//!
443443
//! # Minimum Supported Rust Version (MSRV)
444444
//!
445-
//! The MSRV of this release is Rust 1.59.0.
445+
//! The MSRV of this release is Rust 1.60.0.
446446
447447
// # Developer notes
448448
//

cortex-m-semihosting/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
## [Unreleased]
77

8+
- MSRV bumped to 1.60 to align with `embedded-hal` version 1.
9+
810
## [v0.5.0] - 2022-03-01
911

1012
- Always use inline-asm, requiring Rust 1.59.

cortex-m-semihosting/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ readme = "README.md"
1313
repository = "https://github.com/rust-embedded/cortex-m"
1414
version = "0.5.0"
1515
edition = "2021"
16-
rust-version = "1.59"
16+
rust-version = "1.60"
1717

1818
[features]
1919
jlink-quirks = []

cortex-m-semihosting/README.md

Lines changed: 1 addition & 1 deletion
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.59.0 and up. It *might*
14+
This crate is guaranteed to compile on stable Rust 1.60.0 and up. It *might*
1515
compile with older versions but that may change in any new patch release.
1616

1717
## License

0 commit comments

Comments
 (0)