diff options
| -rw-r--r-- | rtic-macros/src/codegen/bindings/esp32c6.rs | 5 | ||||
| -rw-r--r-- | rtic/src/export/riscv_esp32c6.rs | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rtic-macros/src/codegen/bindings/esp32c6.rs b/rtic-macros/src/codegen/bindings/esp32c6.rs index 1d22466..263651b 100644 --- a/rtic-macros/src/codegen/bindings/esp32c6.rs +++ b/rtic-macros/src/codegen/bindings/esp32c6.rs @@ -2,6 +2,7 @@ pub use esp32c6::*; #[cfg(feature = "riscv-esp32c6")] +#[allow(clippy::module_inception)] mod esp32c6 { use crate::{ analyze::Analysis as CodegenAnalysis, @@ -97,7 +98,7 @@ mod esp32c6 { .chain( app.hardware_tasks .values() - .filter_map(|task| Some((&task.args.priority, &task.args.binds))), + .map(|task| (&task.args.priority, &task.args.binds)), ) .zip(EXTERNAL_INTERRUPTS) { @@ -238,7 +239,7 @@ mod esp32c6 { .chain( app.hardware_tasks .values() - .filter_map(|task| Some((&task.args.priority, &task.args.binds))), + .map(|task| (&task.args.priority, &task.args.binds)), ) .zip(EXTERNAL_INTERRUPTS) { diff --git a/rtic/src/export/riscv_esp32c6.rs b/rtic/src/export/riscv_esp32c6.rs index 6789f26..7bd5303 100644 --- a/rtic/src/export/riscv_esp32c6.rs +++ b/rtic/src/export/riscv_esp32c6.rs @@ -58,8 +58,7 @@ where pub unsafe fn lock<T, R>(ptr: *mut T, ceiling: u8, f: impl FnOnce(&mut T) -> R) -> R { if ceiling == (15) { // Turn off interrupts completely, we're at max prio - let r = critical_section::with(|_| f(&mut *ptr)); - r + critical_section::with(|_| f(&mut *ptr)) } else { let current = unsafe { (*PLIC_MX::ptr()) |