From 777e27c79ca4f3b41432898238cf114a386142aa Mon Sep 17 00:00:00 2001 From: Thomas Karpiniec Date: Mon, 2 Jun 2025 15:37:23 +1000 Subject: [PATCH] Fix clippy lints --- m17core/src/decode.rs | 10 ++-------- m17core/src/reflector/convert.rs | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/m17core/src/decode.rs b/m17core/src/decode.rs index d3dd7ba..3bd8164 100644 --- a/m17core/src/decode.rs +++ b/m17core/src/decode.rs @@ -114,10 +114,7 @@ pub(crate) fn parse_lsf(frame: &[f32] /* length 192 */) -> Option { pub(crate) fn parse_stream(frame: &[f32] /* length 192 */) -> Option { let deinterleaved = frame_initial_decode(frame); let stream_part = &deinterleaved[12..]; - let stream = match fec::decode(stream_part, 144, p_2) { - Some(stream) => stream, - None => return None, - }; + let stream = fec::decode(stream_part, 144, p_2)?; let frame_num = u16::from_be_bytes([stream[0], stream[1]]); let eos = (frame_num & 0x8000) > 0; let frame_num = frame_num & 0x7fff; // higher layer has to handle wraparound @@ -142,10 +139,7 @@ pub(crate) fn parse_stream(frame: &[f32] /* length 192 */) -> Option Option { let deinterleaved = frame_initial_decode(frame); - let packet = match fec::decode(&deinterleaved, 206, p_3) { - Some(packet) => packet, - None => return None, - }; + let packet = fec::decode(&deinterleaved, 206, p_3)?; let final_frame = (packet[25] & 0x80) > 0; let number = (packet[25] >> 2) & 0x1f; let counter = if final_frame { diff --git a/m17core/src/reflector/convert.rs b/m17core/src/reflector/convert.rs index 7ad54c3..ecbb5a5 100644 --- a/m17core/src/reflector/convert.rs +++ b/m17core/src/reflector/convert.rs @@ -7,6 +7,7 @@ use super::packet::Voice; /// Accepts `Voice` packets from a reflector and turns them into LSF and Stream frames. /// /// This is the format required for the voice data to cross the KISS protocol boundary. +#[derive(Debug, Default)] pub struct VoiceToRf { /// Link Setup most recently acquired lsf: Option, -- 2.39.5