diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-14 16:11:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 16:11:13 +0000 |
| commit | 9527c921923f6b8e19767b1bf52be758817d7035 (patch) | |
| tree | de8ea7d2f2a38a1fb0ea3043d2daf33b44e8dd34 /macros | |
| parent | 2ebd81fee2dc4c793a7c684c5c9050d4a5313bde (diff) | |
| parent | f111c825ba3ab886a1a6bf63a0689c3d63b0f441 (diff) | |
Merge #415
415: Multilock support r=AfoHT a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/src/codegen/hardware_tasks.rs | 1 | ||||
| -rw-r--r-- | macros/src/codegen/idle.rs | 1 | ||||
| -rw-r--r-- | macros/src/codegen/module.rs | 2 | ||||
| -rw-r--r-- | macros/src/codegen/software_tasks.rs | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/macros/src/codegen/hardware_tasks.rs b/macros/src/codegen/hardware_tasks.rs index c9d0297..6930d3e 100644 --- a/macros/src/codegen/hardware_tasks.rs +++ b/macros/src/codegen/hardware_tasks.rs @@ -105,6 +105,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#(#locals_pat,)* #context: #name::Context) { use rtic::Mutex as _; + use rtic::mutex_prelude::*; #(#stmts)* } diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs index c8c8955..b1d2e00 100644 --- a/macros/src/codegen/idle.rs +++ b/macros/src/codegen/idle.rs @@ -68,6 +68,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#(#locals_pat,)* #context: #name::Context) -> ! { use rtic::Mutex as _; + use rtic::mutex_prelude::*; #(#stmts)* } diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs index 838a989..2ff4801 100644 --- a/macros/src/codegen/module.rs +++ b/macros/src/codegen/module.rs @@ -219,6 +219,7 @@ pub fn codegen( pub fn spawn(#(#args,)*) -> Result<(), #ty> { // #let_instant // do we need it? use rtic::Mutex as _; + use rtic::mutex_prelude::*; let input = #tupled; @@ -258,6 +259,7 @@ pub fn codegen( ) -> Result<(), #ty> { unsafe { use rtic::Mutex as _; + use rtic::mutex_prelude::*; let input = #tupled; if let Some(index) = rtic::export::interrupt::free(|_| #app_path::#fq.dequeue()) { diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs index 833e338..9cb5f7a 100644 --- a/macros/src/codegen/software_tasks.rs +++ b/macros/src/codegen/software_tasks.rs @@ -111,6 +111,7 @@ pub fn codegen( #[allow(non_snake_case)] fn #name(#(#locals_pat,)* #context: #name::Context #(,#inputs)*) { use rtic::Mutex as _; + use rtic::mutex_prelude::*; #(#stmts)* } |