rust: add clippy check

.github/workflows/rust.yaml

@@ -38,6 +38,12 @@ jobs:
           command: fmt
           args: -- --check
 
+      - uses: actions-rs/cargo@v1
+        name: Lint Check
+        with:
+          command: clippy
+          args: --all-features --all-targets -- -D warnings
+
   test:
     name: Tests
     runs-on: ubuntu-latest

generator/sbpg/targets/resources/rust/test/sbp_tests_main_template.rs

@@ -11,6 +11,8 @@
 
 // This file was auto-generated. Do not modify by hand!
 
+#![allow(clippy::excessive_precision)]
+
 ((*- for test_name in test_names *))
 mod (((test_name)));
 ((*- endfor *))

generator/sbpg/targets/test_rust.py

@@ -23,7 +23,7 @@
 TEST_MAIN_TEMPLATE_NAME = "rust/test/sbp_tests_main_template.rs"
 
 def str_escape(value):
-    return "\"{}\".to_string()".format(value)
+    return "\"{}\"".format(value)
 
 def mod_name(value):
     return value.split('.')[1]

rust/sbp/src/de.rs

@@ -182,7 +182,7 @@ impl<R: futures::AsyncRead + Unpin> futures::Stream for Decoder<R> {
     ) -> std::task::Poll<Option<Self::Item>> {
         let frame = match futures::ready!(std::pin::Pin::new(&mut self.0).poll_next(cx)) {
             Some(Ok(frame)) => frame,
-            Some(Err(e)) => return std::task::Poll::Ready(Some(Err(e.into()))),
+            Some(Err(e)) => return std::task::Poll::Ready(Some(Err(e))),
             None => return std::task::Poll::Ready(None),
         };
         std::task::Poll::Ready(Some(frame.to_sbp()))
@@ -346,7 +346,7 @@ impl<R: futures::AsyncRead + Unpin> futures::Stream for TimeoutDecoder<R> {
     ) -> std::task::Poll<Option<Self::Item>> {
         match futures::ready!(std::pin::Pin::new(&mut self.0).poll_next(cx)) {
             Some(Ok(frame)) => std::task::Poll::Ready(Some(frame.to_sbp())),
-            Some(Err(e)) => std::task::Poll::Ready(Some(Err(e.into()))),
+            Some(Err(e)) => std::task::Poll::Ready(Some(Err(e))),
             None => std::task::Poll::Ready(None),
         }
     }
@@ -381,10 +381,7 @@ mod tests {
         let timeout_duration = Duration::from_secs(2);
         let now = Instant::now();
         let mut messages = iter_messages_with_timeout(rdr, timeout_duration);
-        for msg in &mut messages {
-            assert!(matches!(msg, Err(Error::IoError(_))));
-            break;
-        }
+        assert!(matches!(messages.next().unwrap(), Err(Error::IoError(_))));
         assert!(now.elapsed() >= timeout_duration);
     }
 

rust/sbp/src/link.rs

@@ -49,7 +49,7 @@ where
         {
             let mut handlers = self.link.inner.handlers.lock().unwrap();
             for handler in handlers.values_mut() {
-                if handler.can_run(&msg) {
+                if handler.can_run(msg) {
                     handler.run(state, msg.clone());
                     sent = true;
                 }
@@ -58,7 +58,7 @@ where
         {
             let mut handlers = self.stateless_link.inner.handlers.lock().unwrap();
             for handler in handlers.values_mut() {
-                if handler.can_run(&msg) {
+                if handler.can_run(msg) {
                     handler.run(&(), msg.clone());
                     sent = true;
                 }
@@ -142,6 +142,7 @@ struct LinkInner<'link, S> {
 }
 
 /// A message handler and the message ids it responds to.
+#[allow(clippy::type_complexity)]
 pub struct Handler<'link, S> {
     func: Box<dyn FnMut(&S, Sbp) + Send + 'link>,
     msg_types: Cow<'static, [u16]>,
@@ -225,7 +226,7 @@ slotmap::new_key_type! {
 }
 
 /// Returned when registering a callback. Can be used to unregister the callback.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct Key {
     key: KeyInner,
 }

rust/sbp/src/sbp_iter_ext.rs

@@ -232,17 +232,17 @@ mod tests {
 
         let mut with_time = iter_messages(data).ignore_errors().with_rover_time();
 
-        let gps_time = with_time.next().map(|(_, t)| t).flatten().unwrap().unwrap();
+        let gps_time = with_time.next().and_then(|(_, t)| t).unwrap().unwrap();
         assert_eq!(gps_time.wn(), 1787);
         assert!((gps_time.tow() - 2567.8).abs() < f64::EPSILON);
 
-        assert!(with_time.next().map(|(_, t)| t).flatten().is_none());
+        assert!(with_time.next().and_then(|(_, t)| t).is_none());
 
-        let gps_time = with_time.next().map(|(_, t)| t).flatten().unwrap().unwrap();
+        let gps_time = with_time.next().and_then(|(_, t)| t).unwrap().unwrap();
         assert_eq!(gps_time.wn(), 1787);
         assert!((gps_time.tow() - 2567.9).abs() < f64::EPSILON);
 
-        let gps_time = with_time.next().map(|(_, t)| t).flatten().unwrap().unwrap();
+        let gps_time = with_time.next().and_then(|(_, t)| t).unwrap().unwrap();
         assert_eq!(gps_time.wn(), 1787);
         assert!((gps_time.tow() - 2568.).abs() < f64::EPSILON);
     }

rust/sbp/src/sbp_string.rs

@@ -487,7 +487,7 @@ mod tests {
         // Auto generate alternating bytes [`from_parts`] section
         // -----
         let parts = ["a", "b", "c"];
-        let multipart = SbpString::<_, Multipart>::from_parts(&parts);
+        let multipart = SbpString::<_, Multipart>::from_parts(parts);
         assert_eq!(multipart.data, null);
 
         // Test [`parts`] section
@@ -525,7 +525,7 @@ mod tests {
         // Auto generate alternating bytes [`from_parts`] section
         // -----
         let parts = ["a", "b", "c"];
-        let double_null = SbpString::<_, DoubleNullTerminated>::from_parts(&parts);
+        let double_null = SbpString::<_, DoubleNullTerminated>::from_parts(parts);
         assert_eq!(double_null.data, data);
 
         // Test [`parts`] section

rust/sbp/tests/integration/auto_check_sbp_bootload_msg_bootloader_handshake_resp.rs

@@ -54,12 +54,10 @@ fn test_auto_check_sbp_bootload_msg_bootloader_handshake_resp() {
                 assert_eq!(
                     msg.version.to_string(),
                     "v1.2
-"
-                    .to_string(),
+",
                     "incorrect value for msg.version, expected string '{}', is '{}'",
                     "v1.2
-"
-                    .to_string(),
+",
                     msg.version
                 );
             }
@@ -173,12 +171,10 @@ fn test_json2sbp_auto_check_sbp_bootload_msg_bootloader_handshake_resp() {
                 assert_eq!(
                     msg.version.to_string(),
                     "v1.2
-"
-                    .to_string(),
+",
                     "incorrect value for msg.version, expected string '{}', is '{}'",
                     "v1.2
-"
-                    .to_string(),
+",
                     msg.version
                 );
             }
@@ -308,12 +304,10 @@ fn test_sbp2json_auto_check_sbp_bootload_msg_bootloader_handshake_resp() {
                 assert_eq!(
                     msg.version.to_string(),
                     "v1.2
-"
-                    .to_string(),
+",
                     "incorrect value for msg.version, expected string '{}', is '{}'",
                     "v1.2
-"
-                    .to_string(),
+",
                     msg.version
                 );
             }

rust/sbp/tests/integration/auto_check_sbp_logging_msg_log.rs

@@ -55,9 +55,9 @@ fn test_auto_check_sbp_logging_msg_log() {
                 );
                 assert_eq!(
                     msg.text.to_string(),
-                    "Filtered all obs from 2314 at tow 83.539019".to_string(),
+                    "Filtered all obs from 2314 at tow 83.539019",
                     "incorrect value for msg.text, expected string '{}', is '{}'",
-                    "Filtered all obs from 2314 at tow 83.539019".to_string(),
+                    "Filtered all obs from 2314 at tow 83.539019",
                     msg.text
                 );
             }
@@ -120,9 +120,9 @@ fn test_json2sbp_auto_check_sbp_logging_msg_log() {
                 );
                 assert_eq!(
                     msg.text.to_string(),
-                    "Filtered all obs from 2314 at tow 83.539019".to_string(),
+                    "Filtered all obs from 2314 at tow 83.539019",
                     "incorrect value for msg.text, expected string '{}', is '{}'",
-                    "Filtered all obs from 2314 at tow 83.539019".to_string(),
+                    "Filtered all obs from 2314 at tow 83.539019",
                     msg.text
                 );
             }
@@ -194,9 +194,9 @@ fn test_sbp2json_auto_check_sbp_logging_msg_log() {
                 );
                 assert_eq!(
                     msg.text.to_string(),
-                    "Filtered all obs from 2314 at tow 83.539019".to_string(),
+                    "Filtered all obs from 2314 at tow 83.539019",
                     "incorrect value for msg.text, expected string '{}', is '{}'",
-                    "Filtered all obs from 2314 at tow 83.539019".to_string(),
+                    "Filtered all obs from 2314 at tow 83.539019",
                     msg.text
                 );
             }