Skip to content

Commit a6be560

Browse files
bors[bot]adamgreig
andauthored
Merge #270
270: Prepare for release of new versions of cortex-m-semihosting and panic-semihosting r=therealprof a=adamgreig For the next step in #263 (review), this PR increases the version number for panic-semihosting and cortex-m-semihosting. For c-m-sh this is a breaking change to include #269. Both projects seem to build just fine with cortex-m master, so I anticipate they should work fine with the to-be-released 0.7, hence increasing the acceptable cortex-m version range. The CHANGELOG links are a bit troublesome, so I've added new tags to this repo `c-m-sh-v0.3.5` and `p-sh-v0.5.3` which point to the merge commit, and I'll tag new `c-m-sh-v0.4.0` and `p-sh-v0.5.4` after this is merged. Co-authored-by: Adam Greig <adam@adamgreig.com>
2 parents 55d67fa + 81ab508 commit a6be560

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

cortex-m-semihosting/CHANGELOG.md

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

66
## [Unreleased]
77

8+
## [v0.4.0] - 2020-10-14
9+
10+
- Moved into cortex-m repository
811
- Merge `HStdout` and `HStderr` into one type: `HostStream`
12+
- Support cortex-m v0.7
913

1014
## [v0.3.5] - 2019-08-29
1115

@@ -111,7 +115,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
111115

112116
- Initial release
113117

114-
[Unreleased]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.5...HEAD
118+
[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.4.0...HEAD
119+
[v0.4.0]: https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.3.5...c-m-sh-v0.4.0
115120
[v0.3.5]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.4...v0.3.5
116121
[v0.3.4]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.3...v0.3.4
117122
[v0.3.3]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.2...v0.3.3

cortex-m-semihosting/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
1010
name = "cortex-m-semihosting"
1111
readme = "README.md"
1212
repository = "https://github.com/rust-embedded/cortex-m"
13-
version = "0.3.5"
13+
version = "0.4.0"
1414
edition = "2018"
1515

1616
[features]
@@ -19,4 +19,4 @@ jlink-quirks = []
1919
no-semihosting = []
2020

2121
[dependencies]
22-
cortex-m = { path = "..", version = ">= 0.5.8, < 0.7" }
22+
cortex-m = { path = "..", version = ">= 0.5.8, < 0.8" }

panic-semihosting/CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [v0.5.4] - 2020-10-14
11+
12+
- Moved into cortex-m repository
13+
- Support cortex-m v0.7, cortex-m-semihosting v0.4
14+
1015
## [v0.5.3] - 2019-09-01
1116

1217
- Added feature `jlink-quirks` to work with JLink
@@ -56,7 +61,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
5661

5762
Initial release
5863

59-
[Unreleased]: https://github.com/rust-embedded/panic-semihosting/compare/v0.5.3...HEAD
64+
[Unreleased]: https://github.com/rust-embedded/panic-semihosting/compare/p-sh-v0.5.4...HEAD
65+
[v0.5.4]: https://github.com/rust-embedded/cortex-m/compare/p-sh-v0.5.3...p-sh-v0.5.4
6066
[v0.5.3]: https://github.com/rust-embedded/panic-semihosting/compare/v0.5.2...v0.5.3
6167
[v0.5.2]: https://github.com/rust-embedded/panic-semihosting/compare/v0.5.1...v0.5.2
6268
[v0.5.1]: https://github.com/rust-embedded/panic-semihosting/compare/v0.5.0...v0.5.1

panic-semihosting/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ keywords = ["panic-handler", "panic-impl", "panic", "semihosting"]
1010
license = "MIT OR Apache-2.0"
1111
name = "panic-semihosting"
1212
repository = "https://github.com/rust-embedded/cortex-m"
13-
version = "0.5.3"
13+
version = "0.5.4"
1414

1515
[dependencies]
16-
cortex-m = { path = "..", version = ">= 0.5.6, < 0.7" }
17-
cortex-m-semihosting = { path = "../cortex-m-semihosting", version = "0.3" }
16+
cortex-m = { path = "..", version = ">= 0.5.6, < 0.8" }
17+
cortex-m-semihosting = { path = "../cortex-m-semihosting", version = ">= 0.3, < 0.5" }
1818

1919
[features]
2020
exit = []

0 commit comments

Comments
 (0)