From 1be9d0067bec44356ab96f0cd6d8252b8145f4ad Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 11 Jun 2020 18:57:56 +0200
Subject: [PATCH 1/2] Prepare for v0.5.2 release

---
 CHANGELOG.md | 11 ++++++++++-
 Cargo.toml   |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f74670408c..7f2e59a5f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.5.2] - 2020-06-11
+
+- Using safe `DWT` interface
+- Using GitHub Actions now
+- Improved CI speed
+- Now `main` can be used as function name
+- Fixed so one can `cfg`-out resources when using a newer compiler
+
 ## [v0.5.1] - 2019-11-19
 - Fixed arithmetic wrapping bug in src/cyccntr.rs
   elapsed and duration could cause an internal overflow trap
@@ -305,7 +313,8 @@ Yanked due to a soundness issue in `init`; the issue has been mostly fixed in v0
 
 - Initial release
 
-[Unreleased]: https://github.com/rtfm-rs/cortex-m-rtfm/compare/v0.5.1...HEAD
+[Unreleased]: https://github.com/rtfm-rs/cortex-m-rtfm/compare/v0.5.2...HEAD
+[v0.5.2]: https://github.com/rtfm-rs/cortex-m-rtfm/compare/v0.5.1...v0.5.2
 [v0.5.1]: https://github.com/rtfm-rs/cortex-m-rtfm/compare/v0.5.0...v0.5.1
 [v0.5.0]: https://github.com/rtfm-rs/cortex-m-rtfm/compare/v0.4.3...v0.5.0
 [v0.4.3]: https://github.com/rtfm-rs/cortex-m-rtfm/compare/v0.4.2...v0.4.3
diff --git a/Cargo.toml b/Cargo.toml
index 41e540202e..6d3e766788 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ license = "MIT OR Apache-2.0"
 name = "cortex-m-rtfm"
 readme = "README.md"
 repository = "https://github.com/rtfm-rs/cortex-m-rtfm"
-version = "0.5.1"
+version = "0.5.2"
 
 [lib]
 name = "rtfm"

From eb6406da7e33e62c8c126b044d80fb70afb8c675 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 11 Jun 2020 19:00:52 +0200
Subject: [PATCH 2/2] Fmt

---
 examples/t-idle-main.rs    | 3 +--
 macros/src/codegen/init.rs | 5 +++--
 src/lib.rs                 | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/t-idle-main.rs b/examples/t-idle-main.rs
index d1bb148312..861bbf226d 100644
--- a/examples/t-idle-main.rs
+++ b/examples/t-idle-main.rs
@@ -9,8 +9,7 @@ use panic_semihosting as _;
 #[rtfm::app(device = lm3s6965)]
 const APP: () = {
     #[init]
-    fn init(_: init::Context) {
-    }
+    fn init(_: init::Context) {}
 
     #[idle]
     fn main(_: main::Context) -> ! {
diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index 534b79b05c..e28354afbf 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -108,8 +108,9 @@ pub fn codegen(
         }
 
         let locals_new = locals_new.iter();
-        let call_init =
-            Some(quote!(let late = crate::#name(#(#locals_new,)* #name::Context::new(core.into()));));
+        let call_init = Some(
+            quote!(let late = crate::#name(#(#locals_new,)* #name::Context::new(core.into()));),
+        );
 
         root_init.push(module::codegen(Context::Init(core), needs_lt, app, extra));
 
diff --git a/src/lib.rs b/src/lib.rs
index 98dd615712..614ba853af 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -164,7 +164,6 @@ pub trait Monotonic {
 /// A marker trait that indicates that it is correct to use this type in multi-core context
 pub trait MultiCore {}
 
-
 /// Sets the given `interrupt` as pending
 ///
 /// This is a convenience function around