chore(rust): fix clippy warnings

Fix clippy warnings

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>

Author: ShadowCurse

src/cpu-template-helper/src/utils/x86_64.rs

@@ -194,7 +194,6 @@ mod tests {
     use vmm::cpu_config::x86_64::custom_cpu_template::CpuidRegisterModifier;
 
     use super::*;
-    use crate::utils::x86_64::{cpuid_leaf_modifier, cpuid_reg_modifier, msr_modifier};
 
     macro_rules! cpuid_modifier_map {
         ($leaf:expr, $subleaf:expr, $flags:expr, $register:expr, $value:expr) => {

src/firecracker/src/api_server/parsed_request.rs

@@ -406,12 +406,12 @@ pub mod tests {
             "{} {} HTTP/1.1\r\nContent-Type: application/json\r\n",
             request_type, endpoint
         );
-        if body.is_some() {
+        if let Some(body) = body {
             return format!(
                 "{}Content-Length: {}\r\n\r\n{}",
                 req_no_body,
-                body.unwrap().len(),
-                body.unwrap()
+                body.len(),
+                body
             );
         }
         format!("{}\r\n", req_no_body,)

src/vmm/src/arch/x86_64/interrupts.rs

@@ -111,7 +111,7 @@ mod tests {
 
         v.iter_mut()
             .for_each(|x| *x = set_apic_delivery_mode(*x, 2));
-        let after: Vec<u32> = v.iter().map(|x| ((*x & !0x700) | ((2) << 8))).collect();
+        let after: Vec<u32> = v.iter().map(|x| (*x & !0x700) | ((2) << 8)).collect();
         assert_eq!(v, after);
     }
 

src/vmm/src/devices/virtio/balloon/device.rs

@@ -393,7 +393,7 @@ impl Balloon {
                 let max_len = MAX_PAGES_IN_DESC * SIZE_OF_U32;
                 valid_descs_found = true;
 
-                if !head.is_write_only() && len % SIZE_OF_U32 == 0 {
+                if !head.is_write_only() && len.is_multiple_of(SIZE_OF_U32) {
                     // Check descriptor pfn count.
                     if len > max_len {
                         error!(

src/vmm/src/devices/virtio/block/vhost_user/device.rs

@@ -69,19 +69,20 @@ impl TryFrom<&BlockDeviceConfig> for VhostUserBlockConfig {
     type Error = VhostUserBlockError;
 
     fn try_from(value: &BlockDeviceConfig) -> Result<Self, Self::Error> {
-        if value.socket.is_some()
-            && value.is_read_only.is_none()
-            && value.path_on_host.is_none()
-            && value.rate_limiter.is_none()
-            && value.file_engine_type.is_none()
-        {
+        if let (Some(socket), None, None, None, None) = (
+            &value.socket,
+            &value.is_read_only,
+            &value.path_on_host,
+            &value.rate_limiter,
+            &value.file_engine_type,
+        ) {
             Ok(Self {
                 drive_id: value.drive_id.clone(),
                 partuuid: value.partuuid.clone(),
                 is_root_device: value.is_root_device,
                 cache_type: value.cache_type,
 
-                socket: value.socket.as_ref().unwrap().clone(),
+                socket: socket.clone(),
             })
         } else {
             Err(VhostUserBlockError::Config)

src/vmm/src/devices/virtio/block/virtio/device.rs

@@ -204,15 +204,16 @@ impl TryFrom<&BlockDeviceConfig> for VirtioBlockConfig {
     type Error = VirtioBlockError;
 
     fn try_from(value: &BlockDeviceConfig) -> Result<Self, Self::Error> {
-        if value.path_on_host.is_some() && value.socket.is_none() {
+        if let (Some(path_on_host), None) = (&value.path_on_host, &value.socket) {
+            // if value.path_on_host.is_some() && value.socket.is_none() {
             Ok(Self {
                 drive_id: value.drive_id.clone(),
                 partuuid: value.partuuid.clone(),
                 is_root_device: value.is_root_device,
                 cache_type: value.cache_type,
 
                 is_read_only: value.is_read_only.unwrap_or(false),
-                path_on_host: value.path_on_host.as_ref().unwrap().clone(),
+                path_on_host: path_on_host.clone(),
                 rate_limiter: value.rate_limiter,
                 file_engine_type: value.file_engine_type.unwrap_or_default(),
             })

src/vmm/src/devices/virtio/block/virtio/request.rs

@@ -297,7 +297,7 @@ impl Request {
             RequestType::In | RequestType::Out => {
                 // Check that the data length is a multiple of 512 as specified in the virtio
                 // standard.
-                if req.data_len % SECTOR_SIZE != 0 {
+                if !req.data_len.is_multiple_of(SECTOR_SIZE) {
                     return Err(VirtioBlockError::InvalidDataLength);
                 }
                 let top_sector = req

src/vmm/src/devices/virtio/mem/device.rs

@@ -570,7 +570,7 @@ impl VirtioMem {
             return Err(VirtioMemError::DeviceNotActive);
         }
 
-        if requested_size % self.config.block_size != 0 {
+        if !requested_size.is_multiple_of(self.config.block_size) {
             return Err(VirtioMemError::InvalidSize(requested_size));
         }
         if requested_size > self.config.region_size {

src/vmm/src/dumbo/pdu/mod.rs

@@ -96,7 +96,7 @@ fn compute_checksum<T: NetworkBytes + Debug>(
         sum += usize::from(bytes.ntohs_unchecked(i * 2));
     }
 
-    if len % 2 != 0 {
+    if !len.is_multiple_of(2) {
         sum += usize::from(bytes[len - 1]) << 8;
     }
 

src/vmm/src/rate_limiter/mod.rs

@@ -152,7 +152,7 @@ impl TokenBucket {
             // we would allow some fraction of a nano second to be used twice, allowing
             // for the generation of one extra token in extreme circumstances).
             let mut time_adjustment = tokens * processed_refill_time / processed_capacity;
-            if tokens * processed_refill_time % processed_capacity != 0 {
+            if !(tokens * processed_refill_time).is_multiple_of(processed_capacity) {
                 time_adjustment += 1;
             }