diff options
| author | Henrik Tjäder <henrik@grepit.se> | 2022-02-18 15:11:55 +0100 |
|---|---|---|
| committer | Henrik Tjäder <henrik@grepit.se> | 2022-02-18 18:42:19 +0100 |
| commit | 2c14c9bce3b22462cce982258ddecb53df16ab49 (patch) | |
| tree | cf0ad4582d938b5190af804fdeaea7ea9d1aeb4b | |
| parent | 886183066d3bb8c359aaf6442e9201bab8cd4694 (diff) | |
rtic::mutex::prelude::* fixes glob import lint
rtic-core Mutex, Exclusive and multi-lock retained in
old location to not be backwards breaking
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | macros/src/codegen/hardware_tasks.rs | 2 | ||||
| -rw-r--r-- | macros/src/codegen/idle.rs | 2 | ||||
| -rw-r--r-- | macros/src/codegen/software_tasks.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 5 |
5 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bd1829..576bc60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +- Re-export `rtic_core::prelude` as `rtic::mutex::prelude` to allow glob imports + Clippy - Fix dated migration docs for spawn - Force mdBook to return error codes - Readded missing ramfunc output to book diff --git a/macros/src/codegen/hardware_tasks.rs b/macros/src/codegen/hardware_tasks.rs index e6192e2..f75c71d 100644 --- a/macros/src/codegen/hardware_tasks.rs +++ b/macros/src/codegen/hardware_tasks.rs @@ -97,7 +97,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#context: #name::Context) { use rtic::Mutex as _; - use rtic::mutex_prelude::*; + use rtic::mutex::prelude::*; #(#stmts)* } diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs index 0dededa..83b85d7 100644 --- a/macros/src/codegen/idle.rs +++ b/macros/src/codegen/idle.rs @@ -68,7 +68,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#context: #name::Context) -> ! { use rtic::Mutex as _; - use rtic::mutex_prelude::*; + use rtic::mutex::prelude::*; #(#stmts)* } diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs index c767032..0357003 100644 --- a/macros/src/codegen/software_tasks.rs +++ b/macros/src/codegen/software_tasks.rs @@ -131,7 +131,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#context: #name::Context #(,#inputs)*) { use rtic::Mutex as _; - use rtic::mutex_prelude::*; + use rtic::mutex::prelude::*; #(#stmts)* } @@ -42,6 +42,11 @@ pub use cortex_m_rtic_macros::app; pub use rtic_core::{prelude as mutex_prelude, Exclusive, Mutex}; pub use rtic_monotonic::{self, Monotonic}; +/// module `mutex::prelude` provides `Mutex` and multi-lock variants. Recommended over `mutex_prelude` +pub mod mutex { + pub use rtic_core::prelude; +} + #[doc(hidden)] pub mod export; #[doc(hidden)] |