Address some clippy lints

diff --git a/m17core/src/kiss.rs b/m17core/src/kiss.rs
index ec30296a31ab5d9706529897e25b148d23b9aa31..4ada6dca77184ecad4508671a2de95b0b02c4deb 100644 (file)
--- a/m17core/src/kiss.rs
+++ b/m17core/src/kiss.rs
@@ -215,15 +215,13 @@ impl KissFrame {
             .iter()
             .enumerate()
             .skip_while(|(_, b)| **b == FEND)
             .iter()
             .enumerate()
             .skip_while(|(_, b)| **b == FEND)

-            .skip(1)
-            .next()
+            .nth(1)

             .ok_or(KissError::MalformedKissFrame)?
             .0;
         let end = self.data[start..]
             .iter()
             .enumerate()
             .ok_or(KissError::MalformedKissFrame)?
             .0;
         let end = self.data[start..]
             .iter()
             .enumerate()

-            .skip_while(|(_, b)| **b != FEND)
-            .next()
+            .find(|(_, b)| **b == FEND)

             .ok_or(KissError::MalformedKissFrame)?
             .0
             + start;
             .ok_or(KissError::MalformedKissFrame)?
             .0
             + start;


@@ -237,13 +235,11 @@ impl KissFrame {
 
     /// Return the header byte of the KISS frame, skipping over 0 or more prepended FENDs.
     fn header_byte(&self) -> Result<u8, KissError> {
 
     /// Return the header byte of the KISS frame, skipping over 0 or more prepended FENDs.
     fn header_byte(&self) -> Result<u8, KissError> {

-        Ok(self
-            .data
+        self.data

             .iter()
             .iter()

-            .skip_while(|b| **b == FEND)
-            .next()
+            .find(|b| **b != FEND)

             .cloned()
             .cloned()

-            .ok_or(KissError::MalformedKissFrame)?)
+            .ok_or(KissError::MalformedKissFrame)

     }
 }
 
     }
 }
 


@@ -393,6 +389,12 @@ impl KissBuffer {
     }
 }
 
     }
 }
 

+impl Default for KissBuffer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+

 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum KissError {
     MalformedKissFrame,
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum KissError {
     MalformedKissFrame,

diff --git a/m17core/src/modem.rs b/m17core/src/modem.rs
index 8cbd0033d8e9358f10fd281028903ea8db1d0593..3d4890ad857376aba09d28ad46630be608ee698f 100644 (file)
--- a/m17core/src/modem.rs
+++ b/m17core/src/modem.rs
@@ -503,6 +503,12 @@ impl Modulator for SoftModulator {
     }
 }
 
     }
 }
 

+impl Default for SoftModulator {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+

 #[derive(Debug)]
 pub(crate) struct DecodeCandidate {
     burst: SyncBurst,
 #[derive(Debug)]
 pub(crate) struct DecodeCandidate {
     burst: SyncBurst,

diff --git a/m17core/src/protocol.rs b/m17core/src/protocol.rs
index 1c9fa13a9bb9e1605e8e32bbf81f941587cd5ecf..669e3a0342955f6d0f75f8a8c70442d8f9b2ceba 100755 (executable)
--- a/m17core/src/protocol.rs
+++ b/m17core/src/protocol.rs
@@ -170,12 +170,12 @@ impl LsfFrame {
     }
 
     pub fn set_destination(&mut self, destination: &Address) {
     }
 
     pub fn set_destination(&mut self, destination: &Address) {

-        self.0[0..6].copy_from_slice(&encode_address(&destination));
+        self.0[0..6].copy_from_slice(&encode_address(destination));

         self.recalculate_crc();
     }
 
     pub fn set_source(&mut self, source: &Address) {
         self.recalculate_crc();
     }
 
     pub fn set_source(&mut self, source: &Address) {

-        self.0[6..12].copy_from_slice(&encode_address(&source));
+        self.0[6..12].copy_from_slice(&encode_address(source));

         self.recalculate_crc();
     }
 
         self.recalculate_crc();
     }
 


@@ -217,7 +217,7 @@ impl LsfFrame {
         bits.set_bit(12 * 8 + 5, (number >> 3) & 1);
         bits.set_bit(12 * 8 + 6, (number >> 2) & 1);
         bits.set_bit(12 * 8 + 7, (number >> 1) & 1);
         bits.set_bit(12 * 8 + 5, (number >> 3) & 1);
         bits.set_bit(12 * 8 + 6, (number >> 2) & 1);
         bits.set_bit(12 * 8 + 7, (number >> 1) & 1);

-        bits.set_bit(13 * 8 + 0, number & 1);
+        bits.set_bit(13 * 8, number & 1);

         self.recalculate_crc();
     }
 
         self.recalculate_crc();
     }
 

diff --git a/m17core/src/tnc.rs b/m17core/src/tnc.rs
index 8965499f2d7045b5d86fb5c4fad2a1ec93dfe3bb..a74499b65112802caa2fbe9f497abe17ea530a74 100644 (file)
--- a/m17core/src/tnc.rs
+++ b/m17core/src/tnc.rs
@@ -217,14 +217,11 @@ impl SoftTnc {
 
     pub fn set_now(&mut self, now_samples: u64) {
         self.now = now_samples;
 
     pub fn set_now(&mut self, now_samples: u64) {
         self.now = now_samples;

-        match self.state {
-            State::TxEndingAtTime(time) => {
-                if now_samples >= time {
-                    self.ptt = false;
-                    self.state = State::Idle;
-                }
+        if let State::TxEndingAtTime(time) = self.state {
+            if now_samples >= time {
+                self.ptt = false;
+                self.state = State::Idle;

             }
             }

-            _ => (),

         }
     }
 
         }
     }
 


@@ -234,11 +231,8 @@ impl SoftTnc {
 
     pub fn set_tx_end_time(&mut self, in_samples: usize) {
         log::debug!("tnc has been told that tx will complete in {in_samples} samples");
 
     pub fn set_tx_end_time(&mut self, in_samples: usize) {
         log::debug!("tnc has been told that tx will complete in {in_samples} samples");

-        match self.state {
-            State::TxEnding => {
-                self.state = State::TxEndingAtTime(self.now + in_samples as u64);
-            }
-            _ => (),
+        if let State::TxEnding = self.state {
+            self.state = State::TxEndingAtTime(self.now + in_samples as u64);

         }
     }
 
         }
     }
 


@@ -411,7 +405,7 @@ impl SoftTnc {
                 pending.app_data[len..len + 2].copy_from_slice(&packet_crc.to_be_bytes());
                 pending.app_data_len = len + 2;
                 pending.lsf = Some(LsfFrame::new_packet(
                 pending.app_data[len..len + 2].copy_from_slice(&packet_crc.to_be_bytes());
                 pending.app_data_len = len + 2;
                 pending.lsf = Some(LsfFrame::new_packet(

-                    &Address::Callsign(Callsign(b"M17RT-PKT".clone())),
+                    &Address::Callsign(Callsign(*b"M17RT-PKT")),

                     &Address::Broadcast,
                 ));
                 self.packet_queue[self.packet_next] = pending;
                     &Address::Broadcast,
                 ));
                 self.packet_queue[self.packet_next] = pending;


@@ -491,6 +485,12 @@ impl SoftTnc {
     }
 }
 
     }
 }
 

+impl Default for SoftTnc {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+

 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum SoftTncError {
     General(&'static str),
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum SoftTncError {
     General(&'static str),