aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2022-06-23 12:01:45 +0000
committerGravatar GitHub <noreply@github.com> 2022-06-23 12:01:45 +0000
commit981fa1fb30a70ec2416778b3e8daa491108deb41 (patch)
treef5c3b93661d87676ec62c1ecd5fb367a13e08b4b
parentb9d7a113b696c8e2c0f0e1bea57c9c0b845e695f (diff)
parent563a3c9d4cc04014a7c2902b72811ea58a784960 (diff)
downloadrtic-981fa1fb30a70ec2416778b3e8daa491108deb41.tar.gz
rtic-981fa1fb30a70ec2416778b3e8daa491108deb41.tar.zst
rtic-981fa1fb30a70ec2416778b3e8daa491108deb41.zip
Merge #650v1.1.3
650: Release RTIC v1.1.3 r=korken89 a=AfoHT Co-authored-by: Henrik Tjäder <henrik@grepit.se>
-rw-r--r--CHANGELOG.md31
-rw-r--r--Cargo.toml2
2 files changed, 13 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1573a578..68af7693 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,31 +13,26 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
### Changed
-## [v1.1.5] - 2022-06-23
+## [v1.1.3] - 2022-06-23
### Added
### Fixed
-Bump rtic-syntax to 1.0.2
-fix ci: use SYST::PTR
-### Changed
+- Bump cortex-m-rtic-macros to 1.1.5
+- fix ci: use SYST::PTR
-## [v1.1.4] - 2022-05-24
+#### cortex-m-rtic-macros v1.1.5 - 2022-06-23
-### Added
+- Bump rtic-syntax to 1.0.2
-### Fixed
-Fix macros to Rust 2021
+#### cortex-m-rtic-macros v1.1.4 - 2022-05-24
-### Changed
+- Fix macros to Rust 2021
-## [v1.1.3] - 2022-05-24
+#### cortex-m-rtic-macros v1.1.3 - 2022-05-24
-### Added
-
-### Fixed
-Fix clash with defmt
+- Fix clash with defmt
### Changed
@@ -541,11 +536,9 @@ Yanked due to a soundness issue in `init`; the issue has been mostly fixed in v0
- Initial release
-[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.5...HEAD
-[v1.1.5]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.0.4...v1.1.5
-[v1.1.4]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.0.3...v1.1.4
-[v1.1.3]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.0.2...v1.1.3
-[v1.1.2]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.0.1...v1.1.2
+[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.3...HEAD
+[v1.1.3]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.2...v1.1.3
+[v1.1.2]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.1...v1.1.2
[v1.1.1]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.1.0...v1.1.1
[v1.1.0]: https://github.com/rtic-rs/cortex-m-rtic/compare/v1.0.0...v1.1.0
[v1.0.0]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.4...v1.0.0
diff --git a/Cargo.toml b/Cargo.toml
index fa1a5bb9..922385c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ name = "cortex-m-rtic"
readme = "README.md"
repository = "https://github.com/rtic-rs/cortex-m-rtic"
-version = "1.1.2"
+version = "1.1.3"
[lib]
name = "rtic"