chore: appease clippy

Som new complaints, mostly dealt with using `cargo clippy --fix` (except
the `continue`, which I had to manually remove)

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

Author: roypat

src/rebase-snap/src/main.rs

@@ -44,7 +44,7 @@ enum RebaseSnapError {
 }
 
 fn build_arg_parser<'a>() -> ArgParser<'a> {
-    let arg_parser = ArgParser::new()
+    ArgParser::new()
         .arg(
             Argument::new(BASE_FILE)
                 .required(true)
@@ -56,9 +56,7 @@ fn build_arg_parser<'a>() -> ArgParser<'a> {
                 .required(true)
                 .takes_value(true)
                 .help("File path of the diff mem snapshot."),
-        );
-
-    arg_parser
+        )
 }
 
 fn get_files(args: &Arguments) -> Result<(File, File), FileError> {

src/vmm/src/cpu_config/x86_64/cpuid/intel/normalize.rs

@@ -345,7 +345,7 @@ fn default_brand_string(
             let c = before[i];
             match c {
                 b' ' => break 'outer Ok(before.split_at(i)),
-                b'0'..=b'9' | b'.' => continue,
+                b'0'..=b'9' | b'.' => (),
                 _ => break,
             }
         }
@@ -373,13 +373,12 @@ fn default_brand_string(
         // Include frequency suffix e.g. "GHz"
         .chain(after.iter().copied())
         // Pad with 0s to `BRAND_STRING_LENGTH`
-        .chain(
-            std::iter::repeat(b'\0').take(
-                BRAND_STRING_LENGTH
-                    .checked_sub(len)
-                    .ok_or(DefaultBrandStringError::Overflow)?,
-            ),
-        )
+        .chain(std::iter::repeat_n(
+            b'\0',
+            BRAND_STRING_LENGTH
+                .checked_sub(len)
+                .ok_or(DefaultBrandStringError::Overflow)?,
+        ))
         .collect::<Vec<_>>();
     debug_assert_eq!(brand_string.len(), BRAND_STRING_LENGTH);
 

src/vmm/src/devices/virtio/vsock/csm/txbuf.rs

@@ -142,9 +142,9 @@ impl WriteVolatile for TxBuf {
         &mut self,
         buf: &VolatileSlice<B>,
     ) -> Result<usize, VolatileMemoryError> {
-        self.push(buf).map(|()| buf.len()).map_err(|err| {
-            VolatileMemoryError::IOError(std::io::Error::new(std::io::ErrorKind::Other, err))
-        })
+        self.push(buf)
+            .map(|()| buf.len())
+            .map_err(|err| VolatileMemoryError::IOError(std::io::Error::other(err)))
     }
 }
 

src/vmm/src/logger/logging.rs

@@ -234,16 +234,16 @@ impl<'de> Deserialize<'de> for LevelFilter {
     {
         use serde::de::Error;
         let key = String::deserialize(deserializer)?;
-        let level = match key.to_lowercase().as_str() {
+
+        match key.to_lowercase().as_str() {
             "off" => Ok(LevelFilter::Off),
             "trace" => Ok(LevelFilter::Trace),
             "debug" => Ok(LevelFilter::Debug),
             "info" => Ok(LevelFilter::Info),
             "warn" | "warning" => Ok(LevelFilter::Warn),
             "error" => Ok(LevelFilter::Error),
             _ => Err(D::Error::custom("Invalid LevelFilter")),
-        };
-        level
+        }
     }
 }
 

src/vmm/src/vstate/kvm.rs

@@ -106,15 +106,7 @@ pub(crate) mod tests {
         ];
 
         let combined_caps = Kvm::combine_capabilities(&additional_capabilities);
-        assert!(
-            combined_caps
-                .iter()
-                .any(|c| *c == kvm_bindings::KVM_CAP_IOMMU)
-        );
-        assert!(
-            !combined_caps
-                .iter()
-                .any(|c| *c == kvm_bindings::KVM_CAP_IOEVENTFD)
-        );
+        assert!(combined_caps.contains(&kvm_bindings::KVM_CAP_IOMMU));
+        assert!(!combined_caps.contains(&kvm_bindings::KVM_CAP_IOEVENTFD));
     }
 }

src/vmm/src/vstate/vcpu.rs

@@ -140,7 +140,7 @@ impl Vcpu {
         // _before_ running this, then there is nothing we can do.
         Self::TLS_VCPU_PTR.with(|cell: &VcpuCell| {
             if let Some(vcpu_ptr) = cell.get() {
-                if vcpu_ptr == self as *mut Vcpu {
+                if std::ptr::eq(vcpu_ptr, self) {
                     Self::TLS_VCPU_PTR.with(|cell: &VcpuCell| cell.take());
                     return Ok(());
                 }