From 03af9b19943e3b953ec8f557e5359d6b8627de5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Sun, 7 Nov 2021 00:42:57 +0100 Subject: [PATCH 1/5] Match new rtic-syntax naming of shared and local --- macros/src/codegen/post_init.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros/src/codegen/post_init.rs b/macros/src/codegen/post_init.rs index 07fbd03c9c..8bd3a7ddcf 100644 --- a/macros/src/codegen/post_init.rs +++ b/macros/src/codegen/post_init.rs @@ -14,7 +14,7 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec { let mangled_name = util::static_shared_resource_ident(name); // If it's live let cfgs = res.cfgs.clone(); - if analysis.shared_resource_locations.get(name).is_some() { + if analysis.shared_resources.get(name).is_some() { stmts.push(quote!( // We include the cfgs #(#cfgs)* @@ -31,7 +31,7 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec { let mangled_name = util::static_local_resource_ident(name); // If it's live let cfgs = res.cfgs.clone(); - if analysis.local_resource_locations.get(name).is_some() { + if analysis.local_resources.get(name).is_some() { stmts.push(quote!( // We include the cfgs #(#cfgs)* From eb345b7dbb6826940c2aee3c51fd077d29284cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Mon, 8 Nov 2021 18:39:09 +0100 Subject: [PATCH 2/5] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61e12556d0..6caab7fa83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Fixed + +- Match rtic-syntax Analysis-struct updates from https://github.com/rtic-rs/rtic-syntax/pull/61 + ## [v0.6.0-rc.2] - 2021-09-28 - Fixed issue with `cortex_m` being used by the codegen instead of using the `rtic::export::...` which could make an app not compile if Systick is used and the user did not have the cortex-m crate as a dependency From 1438a5b0eaaa06747d3b3c0a89c2121de9682980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Mon, 8 Nov 2021 20:28:57 +0100 Subject: [PATCH 3/5] Update changelog from v0.5.x branch --- CHANGELOG.md | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6caab7fa83..cc7b6b3a2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] + +## [v0.6.0-rc.3] - 2021-11-08 + ### Fixed - Match rtic-syntax Analysis-struct updates from https://github.com/rtic-rs/rtic-syntax/pull/61 @@ -19,12 +22,26 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Monotonic handlers default to maximum priority instead of minimum (to follow RTIC 0.5) - Better support for `rust-analyzer` +## [v0.5.9] - 2021-09-27 + +- Removed the `cortex-m-rt` dependency +- Docs updates + +## [v0.5.8] - 2021-08-19 + +- Feature flag was added to support `cortex-m v0.7.x` +- MSRV raised to 1.38. + ## [v0.6.0-alpha.5] - 2021-07-09 ### Changed - The new resources syntax is implemented. +## [v0.5.7] - 2021-07-05 + +- Backport: "you must enable the rt feature" compile time detection + ## [v0.6.0-alpha.4] - 2021-05-27 ### Fixed @@ -60,6 +77,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Support for multi-locks, see `examples/multilock.rs` for syntax. - New monotonic syntax and support, see `#[monotonic]` +## [v0.5.6] - 2021-03-03 + +- **Security** Use latest security patched heapless + ## [v0.6.0-alpha.0] - 2020-11-14 ### Added @@ -423,7 +444,12 @@ 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/v0.5.5...HEAD +[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.9...HEAD +[v0.5.x unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.8...v0.5.x +[v0.5.9]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.8...v0.5.9 +[v0.5.8]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.7...v0.5.8 +[v0.5.7]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.6...v0.5.7 +[v0.5.6]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.5...v0.5.6 [v0.5.5]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.4...v0.5.5 [v0.5.4]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.3...v0.5.4 [v0.5.3]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.2...v0.5.3 From f7d4b5dc70dac3768d128cf8fd8a8f810fdace16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Mon, 8 Nov 2021 20:40:59 +0100 Subject: [PATCH 4/5] CHANGELOG: Add links to v0.6.x --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc7b6b3a2a..c86bb03e07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -444,7 +444,17 @@ 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/v0.5.9...HEAD +[Unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.3...HEAD +[v0.6.0-rc.3]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.2...v0.6.0-rc.3 +[v0.6.0-rc.2]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.1...v0.6.0-rc.2 +[v0.6.0-rc.1]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-rc.0...v0.6.0-rc.1 +[v0.6.0-rc.0]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-alpha.5...v0.6.0-rc.0 +[v0.6.0-alpha.5]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-alpha.4...v0.6.0-alpha.5 +[v0.6.0-alpha.4]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-alpha.3...v0.6.0-alpha.4 +[v0.6.0-alpha.3]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-alpha.2...v0.6.0-alpha.3 +[v0.6.0-alpha.2]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-alpha.1...v0.6.0-alpha.2 +[v0.6.0-alpha.1]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.6.0-alpha.0...v0.6.0-alpha.1 +[v0.6.0-alpha.0]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.5...v0.6.0-alpha.0 [v0.5.x unreleased]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.8...v0.5.x [v0.5.9]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.8...v0.5.9 [v0.5.8]: https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.7...v0.5.8 From 0492d98916fb05f0ce0906b42bf7f2ee292f4b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Mon, 8 Nov 2021 20:42:04 +0100 Subject: [PATCH 5/5] Bump version to 0.6.0-rc.3 --- Cargo.toml | 4 ++-- macros/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3f32a80eee..baf287cc10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,14 +14,14 @@ name = "cortex-m-rtic" readme = "README.md" repository = "https://github.com/rtic-rs/cortex-m-rtic" -version = "0.6.0-rc.2" +version = "0.6.0-rc.3" [lib] name = "rtic" [dependencies] cortex-m = "0.7.0" -cortex-m-rtic-macros = { path = "macros", version = "0.6.0-rc.2" } +cortex-m-rtic-macros = { path = "macros", version = "0.6.0-rc.3" } rtic-monotonic = "0.1.0-rc.1" rtic-core = "0.3.1" heapless = "0.7.7" diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 986e22b038..de335bc444 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0" name = "cortex-m-rtic-macros" readme = "../README.md" repository = "https://github.com/rtic-rs/cortex-m-rtic" -version = "0.6.0-rc.2" +version = "0.6.0-rc.3" [lib] proc-macro = true @@ -22,4 +22,4 @@ proc-macro2 = "1" proc-macro-error = "1" quote = "1" syn = "1" -rtic-syntax = "0.5.0-rc.1" +rtic-syntax = "0.5.0-rc.2"