From 79e224acd6a4d5c64e6b6b04770bdb92008004cf Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Feb 2026 12:59:50 +0100 Subject: [PATCH] clippy fixes --- va108xx/flashloader/src/main.rs | 4 ++-- va416xx/bootloader/src/main.rs | 4 ++-- va416xx/flashloader/src/main.rs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/va108xx/flashloader/src/main.rs b/va108xx/flashloader/src/main.rs index 769ca4e..86c5ea6 100644 --- a/va108xx/flashloader/src/main.rs +++ b/va108xx/flashloader/src/main.rs @@ -269,8 +269,8 @@ mod app { fn handle_valid_pus_tc(cx: &mut pus_tc_handler::Context) { let pus_tc = PusTcReader::new(cx.local.tc_buf); - if pus_tc.is_err() { - defmt::warn!("PUS TC error: {}", pus_tc.unwrap_err()); + if let Err(e) = pus_tc { + defmt::warn!("PUS TC error: {}", e); return; } let pus_tc = pus_tc.unwrap(); diff --git a/va416xx/bootloader/src/main.rs b/va416xx/bootloader/src/main.rs index aa47c0a..154db0c 100644 --- a/va416xx/bootloader/src/main.rs +++ b/va416xx/bootloader/src/main.rs @@ -86,8 +86,8 @@ pub struct OptWdt(Option); impl WdtInterface for OptWdt { fn feed(&self) { - if self.0.is_some() { - self.0.as_ref().unwrap().feed(); + if let Some(wdt) = &self.0 { + wdt.feed(); } } } diff --git a/va416xx/flashloader/src/main.rs b/va416xx/flashloader/src/main.rs index e0fca90..1cf666a 100644 --- a/va416xx/flashloader/src/main.rs +++ b/va416xx/flashloader/src/main.rs @@ -46,8 +46,8 @@ pub struct OptWdt(Option); impl WdtInterface for OptWdt { fn feed(&self) { - if self.0.is_some() { - self.0.as_ref().unwrap().feed(); + if let Some(wdt) = &self.0 { + wdt.feed(); } } } @@ -344,8 +344,8 @@ mod app { fn handle_valid_pus_tc(cx: &mut pus_tc_handler::Context) { let pus_tc = PusTcReader::new(cx.local.tc_buf); - if pus_tc.is_err() { - defmt::warn!("PUS TC error: {}", pus_tc.unwrap_err()); + if let Err(e) = pus_tc { + defmt::warn!("PUS TC error: {}", e); return; } let pus_tc = pus_tc.unwrap(); -- 2.43.0