Skip to content

Commit 4aa033b

Browse files
committed
Allow cortex-m-rt 0.6 and 0.7
1 parent 5ece8e8 commit 4aa033b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1414

1515
## Unreleased
1616

17-
No changes.
17+
### Added
18+
19+
- Support cortex-m-rt `v0.7.0` but still allow `v0.6.13` ([#283])
1820

1921
## [v0.8.0] - 2021-08-16
2022

@@ -476,6 +478,7 @@ let clocks = rcc
476478
[defmt]: https://github.com/knurling-rs/defmt
477479
[filter]: https://defmt.ferrous-systems.com/filtering.html
478480

481+
[#283]: https://github.com/stm32-rs/stm32f3xx-hal/pull/283
479482
[#278]: https://github.com/stm32-rs/stm32f3xx-hal/pull/278
480483
[#277]: https://github.com/stm32-rs/stm32f3xx-hal/pull/277
481484
[#273]: https://github.com/stm32-rs/stm32f3xx-hal/pull/273

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ rustc-args = ["--cfg", "docsrs"]
3535
[dependencies]
3636
cfg-if = "1.0.0"
3737
cortex-m = "0.7.2"
38-
cortex-m-rt = "0.6.14"
38+
cortex-m-rt = { version = ">=0.6.13, <0.8" }
3939
defmt = { version = "0.2.3", optional = true }
4040
embedded-dma = "0.1.2"
4141
embedded-hal = { version = "0.2.5", features = ["unproven"] }
@@ -51,7 +51,6 @@ enumset = { version = "1.0.6", optional = true}
5151

5252
[dev-dependencies]
5353
cortex-m = "0.7.2"
54-
cortex-m-rt = { version = "0.6.13", features = ["device"] }
5554
cortex-m-semihosting = "0.3.7"
5655
defmt-rtt = "0.2.0"
5756
defmt-test = "0.2.3"

testsuite/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ harness = false
5050
[dependencies]
5151
cfg-if = "1.0"
5252
cortex-m = "0.7.0"
53-
cortex-m-rt = "0.6.15"
53+
cortex-m-rt = "0.6.13"
5454
defmt = "0.2.0"
5555
defmt-rtt = "0.2.0"
5656
defmt-test = "0.2.0"

0 commit comments

Comments
 (0)