Clear up all clippy lint

Except those that would require a major version bump (implementing
Eq on publicly exported structs)

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

src/crc.rs

@@ -146,7 +146,7 @@ mod tests {
 
         let mut slice = buf.as_mut_slice();
         let mut crc_writer = CRC64Writer::new(&mut slice);
-        crc_writer.write_all(&write_buf.as_slice()).unwrap();
+        crc_writer.write_all(write_buf.as_slice()).unwrap();
         crc_writer.flush().unwrap();
         assert_eq!(crc_writer.checksum(), 0x29D5_3572_1632_6566);
         assert_eq!(crc_writer.checksum(), crc_writer.crc64);

src/lib.rs

@@ -45,6 +45,7 @@ pub use version_map::VersionMap;
 use versionize_derive::Versionize;
 
 /// Versioned serialization/deserialization error definitions.
+#[allow(clippy::derive_partial_eq_without_eq)] // FIXME: next major release
 #[derive(Debug, PartialEq)]
 pub enum VersionizeError {
     /// An IO error occured.

src/primitives.rs

@@ -39,8 +39,8 @@ macro_rules! impl_versionize {
             where
                 Self: Sized,
             {
-                Ok(bincode::deserialize_from(&mut reader)
-                    .map_err(|ref err| VersionizeError::Deserialize(format!("{:?}", err)))?)
+                bincode::deserialize_from(&mut reader)
+                    .map_err(|ref err| VersionizeError::Deserialize(format!("{:?}", err)))
             }
 
             // Not used.
@@ -103,8 +103,8 @@ impl Versionize for String {
         reader
             .read_exact(v.as_mut_slice())
             .map_err(|e| VersionizeError::Io(e.raw_os_error().unwrap_or(0)))?;
-        Ok(String::from_utf8(v)
-            .map_err(|err| VersionizeError::Deserialize(format!("Utf8 error: {:?}", err)))?)
+        String::from_utf8(v)
+            .map_err(|err| VersionizeError::Deserialize(format!("Utf8 error: {:?}", err)))
     }
 
     // Not used yet.
@@ -166,7 +166,6 @@ macro_rules! impl_versionize_arrays {
     }
 }
 
-#[allow(clippy::reversed_empty_ranges)]
 impl_versionize_arrays! {
     1  2  3  4  5  6  7  8  9 10
    11 12 13 14 15 16 17 18 19 20
@@ -248,7 +247,7 @@ where
         app_version: u16,
     ) -> VersionizeResult<()> {
         // Serialize an Option just like bincode does: u8, T.
-        match &*self {
+        match self {
             Some(value) => {
                 1u8.serialize(writer, version_map, app_version)?;
                 value.serialize(writer, version_map, app_version)
@@ -417,6 +416,8 @@ impl<T: Versionize, U: Versionize> Versionize for (T, U) {
 
 #[cfg(test)]
 mod tests {
+    #![allow(clippy::undocumented_unsafe_blocks)]
+
     use super::*;
     use super::{VersionMap, Versionize, VersionizeResult};
 
@@ -572,6 +573,7 @@ mod tests {
         _vec: Vec<u64>,
         _option: Option<bool>,
         _enums: Vec<CompatibleEnum>,
+        #[allow(clippy::box_collection)] // we want to test boxes explicitly
         _box: Box<String>,
     }
 
@@ -684,10 +686,11 @@ mod tests {
         let vm = VersionMap::new();
         let mut snapshot_mem = vec![0u8; 64];
 
-        let mut store = Vec::new();
-        store.push("test 1".to_owned());
-        store.push("test 2".to_owned());
-        store.push("test 3".to_owned());
+        let store = vec![
+            "test 1".to_owned(),
+            "test 2".to_owned(),
+            "test 3".to_owned(),
+        ];
 
         store
             .serialize(&mut snapshot_mem.as_mut_slice(), &vm, 1)

src/version_map.rs

@@ -278,10 +278,10 @@ mod tests {
         let mut vm = VersionMap::default();
         vm.new_version();
 
-        assert_eq!(vm.is_supported(0), false);
-        assert_eq!(vm.is_supported(1), true);
-        assert_eq!(vm.is_supported(2), true);
-        assert_eq!(vm.is_supported(3), false);
+        assert!(!vm.is_supported(0));
+        assert!(vm.is_supported(1));
+        assert!(vm.is_supported(2));
+        assert!(!vm.is_supported(3));
 
         let mut vm = VersionMap::with_filter(Arc::new(MyFilter));
         vm.new_version();
@@ -291,13 +291,13 @@ mod tests {
         vm.new_version();
 
         let vm1 = vm.clone();
-        assert_eq!(vm1.is_supported(0), false);
-        assert_eq!(vm1.is_supported(1), true);
-        assert_eq!(vm1.is_supported(2), true);
-        assert_eq!(vm1.is_supported(3), true);
-        assert_eq!(vm1.is_supported(4), true);
-        assert_eq!(vm1.is_supported(5), false);
-        assert_eq!(vm1.is_supported(6), false);
+        assert!(!vm1.is_supported(0));
+        assert!(vm1.is_supported(1));
+        assert!(vm1.is_supported(2));
+        assert!(vm1.is_supported(3));
+        assert!(vm1.is_supported(4));
+        assert!(!vm1.is_supported(5));
+        assert!(!vm1.is_supported(6));
         assert_eq!(vm.latest_version(), 6);
     }
 }

tests/test.rs

@@ -1,6 +1,8 @@
 // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+#![allow(clippy::missing_safety_doc)]
+
 extern crate versionize;
 extern crate versionize_derive;
 extern crate vmm_sys_util;
@@ -14,7 +16,7 @@ use vmm_sys_util::generate_fam_struct_impl;
 use versionize::{VersionMap, Versionize, VersionizeError, VersionizeResult};
 use versionize_derive::Versionize;
 
-#[derive(Debug, PartialEq, Versionize)]
+#[derive(Debug, PartialEq, Versionize, Eq)]
 pub enum TestState {
     Zero,
     One(u32),
@@ -149,6 +151,7 @@ fn test_hardcoded_struct_deserialization() {
         option_1: Option<u8>,
         #[version(start = 3, end = 4, default_fn = "default_vec")]
         vec_1: Vec<char>,
+        #[allow(clippy::box_collection)]  // we want to explicitly test Box
         box_1: Box<String>,
         #[version(start = 3)]
         wrapping_1: Wrapping<u32>,
@@ -353,7 +356,7 @@ fn test_hardcoded_enum_deserialization() {
     );
 }
 
-#[derive(Debug, PartialEq, Versionize)]
+#[derive(Debug, PartialEq, Eq, Versionize)]
 pub struct A {
     a: u32,
     #[version(start = 1, end = 2)]
@@ -362,7 +365,7 @@ pub struct A {
     c: String,
 }
 
-#[derive(Debug, PartialEq, Versionize)]
+#[derive(Debug, PartialEq, Eq, Versionize)]
 pub struct X {
     x: bool,
     a_1: A,
@@ -380,7 +383,7 @@ impl A {
 
 impl X {
     fn default_y(_source_version: u16) -> Box<usize> {
-        Box::from(4 as usize)
+        Box::from(4)
     }
 
     fn default_z(_source_version: u16) -> Vec<u8> {
@@ -441,7 +444,7 @@ fn test_nested_structs_deserialization() {
             b: Some(TestState::One(4)),
             c: "some_string".to_owned(),
         },
-        y: Box::from(2 as usize),
+        y: Box::from(2),
         z: vec![16, 4],
     };
     assert_eq!(restored_state, expected_state);
@@ -458,7 +461,7 @@ fn test_nested_structs_deserialization() {
             b: None,
             c: "random".to_owned(),
         },
-        y: Box::from(2 as usize),
+        y: Box::from(2),
         z: vec![16, 4],
     };
     assert_eq!(restored_state, expected_state);
@@ -475,7 +478,7 @@ fn test_nested_structs_deserialization() {
             b: None,
             c: "random".to_owned(),
         },
-        y: Box::from(4 as usize),
+        y: Box::from(4),
         z: vec![24; 4],
     };
     assert_eq!(restored_state, expected_state);
@@ -514,7 +517,7 @@ fn test_versionize_struct_with_array() {
     assert_eq!(restored_test_struct, test_struct);
 }
 
-#[derive(Clone, Debug, PartialEq, Versionize)]
+#[derive(Clone, Debug, PartialEq, Eq, Versionize)]
 pub enum DeviceStatus {
     Inactive,
     Active,
@@ -528,7 +531,7 @@ impl Default for DeviceStatus {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Versionize)]
+#[derive(Clone, Debug, PartialEq, Eq, Versionize)]
 pub enum OperationSupported {
     Add,
     Remove,
@@ -567,7 +570,7 @@ impl OperationSupported {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Versionize)]
+#[derive(Clone, Debug, PartialEq, Eq, Versionize)]
 pub struct Device {
     name: String,
     id: Wrapping<u32>,
@@ -633,7 +636,7 @@ impl Device {
         assert!(target_version < 2);
         self.some_params.push("active".to_owned());
         self.some_params
-            .retain(|x| x.clone() != "inactive".to_owned());
+            .retain(|x| x.clone() != *"inactive");
         Ok(())
     }
 
@@ -782,7 +785,7 @@ fn test_versionize_struct_with_enums() {
     );
 }
 
-#[derive(Clone, Debug, PartialEq, Versionize)]
+#[derive(Clone, Debug, PartialEq, Eq, Versionize)]
 pub enum State {
     Zero,
     One(bool),