Skip to content

Commit 3319a22

Browse files
committed
Enable CI clippy checks nrf52832 and fix issues
1 parent 3702af9 commit 3319a22

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

ci.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cargo clippy -p nrf-mpsl --features nrf52805
1515
cargo clippy -p nrf-mpsl --features nrf52810
1616
cargo clippy -p nrf-mpsl --features nrf52811
1717
cargo clippy -p nrf-mpsl --features nrf52820
18-
# cargo clippy -p nrf-mpsl --features nrf52832
18+
cargo clippy -p nrf-mpsl --features nrf52832
1919
cargo clippy -p nrf-mpsl --features nrf52833
2020
cargo clippy -p nrf-mpsl --features nrf52840
2121
cargo clippy -p nrf-mpsl --features nrf52840,defmt
@@ -33,7 +33,7 @@ cargo clippy -p nrf-sdc --features nrf52805,peripheral,central
3333
cargo clippy -p nrf-sdc --features nrf52810,peripheral,central
3434
cargo clippy -p nrf-sdc --features nrf52811,peripheral,central
3535
cargo clippy -p nrf-sdc --features nrf52820,peripheral,central
36-
# cargo clippy -p nrf-sdc --features nrf52832,peripheral,central
36+
cargo clippy -p nrf-sdc --features nrf52832,peripheral,central
3737
cargo clippy -p nrf-sdc --features nrf52833,peripheral,central
3838
cargo clippy -p nrf-sdc --features nrf52840,peripheral
3939
cargo clippy -p nrf-sdc --features nrf52840,central

nrf-mpsl/src/flash.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -404,12 +404,11 @@ impl FlashOp {
404404
}
405405

406406
// No partial erase for this chip, just do one page at a time
407-
#[allow(unused_variables)]
408407
#[cfg(feature = "nrf52832")]
409408
fn erase<F: Fn() -> u32>(
410-
get_time: F,
411-
slot_duration_us: u32,
412-
elapsed: &mut u32,
409+
_get_time: F,
410+
_slot_duration_us: u32,
411+
_elapsed: &mut u32,
413412
address: &mut u32,
414413
to: u32,
415414
) -> core::ops::ControlFlow<()> {
@@ -421,7 +420,7 @@ impl FlashOp {
421420
p.config.write(|w| w.wen().ren());
422421
*address += PAGE_SIZE as u32;
423422
if *address >= to {
424-
return ControlFlow::Break(());
423+
ControlFlow::Break(())
425424
} else {
426425
ControlFlow::Continue(())
427426
}

0 commit comments

Comments
 (0)