Fix clippy lints

diff --git a/m17core/src/decode.rs b/m17core/src/decode.rs
index d3dd7ba087fe0c59b3cdcbf0e557c4d44405cb65..3bd8164f322089aed5a03a7a46110ab2f2812005 100644 (file)
--- a/m17core/src/decode.rs
+++ b/m17core/src/decode.rs
@@ -114,10 +114,7 @@ pub(crate) fn parse_lsf(frame: &[f32] /* length 192 */) -> Option<LsfFrame> {
 pub(crate) fn parse_stream(frame: &[f32] /* length 192 */) -> Option<StreamFrame> {
     let deinterleaved = frame_initial_decode(frame);
     let stream_part = &deinterleaved[12..];
 pub(crate) fn parse_stream(frame: &[f32] /* length 192 */) -> Option<StreamFrame> {
     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
     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<StreamFrame
 
 pub(crate) fn parse_packet(frame: &[f32] /* length 192 */) -> Option<PacketFrame> {
     let deinterleaved = frame_initial_decode(frame);
 
 pub(crate) fn parse_packet(frame: &[f32] /* length 192 */) -> Option<PacketFrame> {
     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 {
     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 7ad54c375b588ffa202ce13a2806a33e4e242deb..ecbb5a5c6573bc673add323e8e4abcd8ee3f9e14 100644 (file)
--- 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.
 /// 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<LsfFrame>,
 pub struct VoiceToRf {
     /// Link Setup most recently acquired
     lsf: Option<LsfFrame>,