fix clippy warnings for Rust 1.52.1

Use Default::default() when initializing structures & use explicit type
definition for constants.

Signed-off-by: Andreea Florescu <[email protected]>

Author: andreeaflorescu

src/ioctls/system.rs

@@ -673,7 +673,7 @@ mod tests {
         assert!(cpuid_entries.len() <= KVM_MAX_CPUID_ENTRIES);
 
         // Test case for more than MAX entries
-        let cpuid_err = kvm.get_emulated_cpuid(KVM_MAX_CPUID_ENTRIES + 1 as usize);
+        let cpuid_err = kvm.get_emulated_cpuid(KVM_MAX_CPUID_ENTRIES + 1_usize);
         assert!(cpuid_err.is_err());
     }
 
@@ -687,7 +687,7 @@ mod tests {
         assert!(cpuid_entries.len() <= KVM_MAX_CPUID_ENTRIES);
 
         // Test case for more than MAX entries
-        let cpuid_err = kvm.get_emulated_cpuid(KVM_MAX_CPUID_ENTRIES + 1 as usize);
+        let cpuid_err = kvm.get_emulated_cpuid(KVM_MAX_CPUID_ENTRIES + 1_usize);
         assert!(cpuid_err.is_err());
     }
 

src/ioctls/vcpu.rs

@@ -1482,7 +1482,7 @@ mod tests {
         if kvm.check_extension(Cap::ExtCpuid) {
             let vm = kvm.create_vm().unwrap();
             let vcpu = vm.create_vcpu(0).unwrap();
-            let err_cpuid = vcpu.get_cpuid2(KVM_MAX_CPUID_ENTRIES + 1 as usize).err();
+            let err_cpuid = vcpu.get_cpuid2(KVM_MAX_CPUID_ENTRIES + 1_usize).err();
             assert_eq!(err_cpuid.unwrap().errno(), libc::ENOMEM);
         }
     }
@@ -1500,7 +1500,7 @@ mod tests {
             for cpu_idx in 0..nr_vcpus {
                 let vcpu = vm.create_vcpu(cpu_idx as u64).unwrap();
                 vcpu.set_cpuid2(&cpuid).unwrap();
-                let err = vcpu.get_cpuid2(ncpuids - 1 as usize).err();
+                let err = vcpu.get_cpuid2(ncpuids - 1_usize).err();
                 assert_eq!(err.unwrap().errno(), libc::E2BIG);
             }
         }
@@ -1602,7 +1602,7 @@ mod tests {
         let mut klapic: kvm_lapic_state = vcpu.get_lapic().unwrap();
 
         let reg_offset = 0x300;
-        let value = 2 as u32;
+        let value = 2_u32;
         //try to write and read the APIC_ICR	0x300
         let write_slice =
             unsafe { &mut *(&mut klapic.regs[reg_offset..] as *mut [i8] as *mut [u8]) };
@@ -2216,16 +2216,20 @@ mod tests {
     fn test_enable_cap() {
         let kvm = Kvm::new().unwrap();
         let vm = kvm.create_vm().unwrap();
-        let mut cap: kvm_enable_cap = Default::default();
-        // KVM_CAP_HYPERV_SYNIC needs KVM_CAP_SPLIT_IRQCHIP enabled
-        cap.cap = KVM_CAP_SPLIT_IRQCHIP;
+        let mut cap = kvm_enable_cap {
+            // KVM_CAP_HYPERV_SYNIC needs KVM_CAP_SPLIT_IRQCHIP enabled
+            cap: KVM_CAP_SPLIT_IRQCHIP,
+            ..Default::default()
+        };
         cap.args[0] = 24;
         vm.enable_cap(&cap).unwrap();
 
         let vcpu = vm.create_vcpu(0).unwrap();
         if kvm.check_extension(Cap::HypervSynic) {
-            let mut cap: kvm_enable_cap = Default::default();
-            cap.cap = KVM_CAP_HYPERV_SYNIC;
+            let cap = kvm_enable_cap {
+                cap: KVM_CAP_HYPERV_SYNIC,
+                ..Default::default()
+            };
             vcpu.enable_cap(&cap).unwrap();
         }
     }

src/ioctls/vm.rs

@@ -42,8 +42,8 @@ pub enum IoEventAddress {
 /// [KVM API documentation](https://www.kernel.org/doc/Documentation/virtual/kvm/api.txt).
 ///
 pub struct NoDatamatch;
-impl Into<u64> for NoDatamatch {
-    fn into(self) -> u64 {
+impl From<NoDatamatch> for u64 {
+    fn from(_: NoDatamatch) -> u64 {
         0
     }
 }
@@ -1378,16 +1378,20 @@ mod tests {
         let vm = kvm.create_vm().unwrap();
         assert!(vm.create_irq_chip().is_ok());
 
-        let mut irqchip = kvm_irqchip::default();
-        irqchip.chip_id = KVM_IRQCHIP_PIC_MASTER;
+        let mut irqchip = kvm_irqchip {
+            chip_id: KVM_IRQCHIP_PIC_MASTER,
+            ..Default::default()
+        };
         // Set the irq_base to a non-default value to check that set & get work.
         irqchip.chip.pic.irq_base = 10;
         assert!(vm.set_irqchip(&irqchip).is_ok());
 
         // We initialize a dummy irq chip (`other_irqchip`) in which the
         // function `get_irqchip` returns its result.
-        let mut other_irqchip = kvm_irqchip::default();
-        other_irqchip.chip_id = KVM_IRQCHIP_PIC_MASTER;
+        let mut other_irqchip = kvm_irqchip {
+            chip_id: KVM_IRQCHIP_PIC_MASTER,
+            ..Default::default()
+        };
         assert!(vm.get_irqchip(&mut other_irqchip).is_ok());
 
         // Safe because we know that the irqchip type is PIC.
@@ -1443,8 +1447,10 @@ mod tests {
         let orig = vm.get_clock().unwrap();
 
         // Reset time.
-        let mut fudged = kvm_clock_data::default();
-        fudged.clock = 10;
+        let fudged = kvm_clock_data {
+            clock: 10,
+            ..Default::default()
+        };
         vm.set_clock(&fudged).unwrap();
 
         // Get new time.
@@ -1768,8 +1774,10 @@ mod tests {
     fn test_enable_split_irqchip_cap() {
         let kvm = Kvm::new().unwrap();
         let vm = kvm.create_vm().unwrap();
-        let mut cap: kvm_enable_cap = Default::default();
-        cap.cap = KVM_CAP_SPLIT_IRQCHIP;
+        let mut cap = kvm_enable_cap {
+            cap: KVM_CAP_SPLIT_IRQCHIP,
+            ..Default::default()
+        };
         // As per the KVM documentation, KVM_CAP_SPLIT_IRQCHIP only emulates
         // the local APIC in kernel, expecting that a userspace IOAPIC will
         // be implemented by the VMM.
@@ -1805,7 +1813,7 @@ mod tests {
         let vm = kvm.create_vm().unwrap();
 
         // Fails when an arbitrarily large value
-        let err = vm.create_vcpu(65537 as u64).err();
+        let err = vm.create_vcpu(65537_u64).err();
         assert_eq!(err.unwrap().errno(), libc::EINVAL);
 
         // Fails when input `id` = `max_vcpu_id`