Skip to content

Commit 5a50456

Browse files
acatangiuandreeaflorescu
authored andcommitted
fix some clippy warnings
Signed-off-by: Adrian Catangiu <[email protected]>
1 parent f988243 commit 5a50456

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

src/ioctls/device.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ mod tests {
100100

101101
let dist_attr = kvm_bindings::kvm_device_attr {
102102
group: KVM_DEV_VFIO_GROUP,
103-
attr: KVM_DEV_VFIO_GROUP_ADD as u64,
103+
attr: u64::from(KVM_DEV_VFIO_GROUP_ADD),
104104
addr: 0x0,
105105
flags: 0,
106106
};

src/ioctls/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl KvmRunWrapper {
4949
/// # Arguments
5050
/// * `fd` - File descriptor to mmap from.
5151
/// * `size` - Size of memory region in bytes.
52-
pub fn mmap_from_fd(fd: &AsRawFd, size: usize) -> Result<KvmRunWrapper> {
52+
pub fn mmap_from_fd(fd: &dyn AsRawFd, size: usize) -> Result<KvmRunWrapper> {
5353
// This is safe because we are creating a mapping in a place not already used by any other
5454
// area in this process.
5555
let addr = unsafe {

src/ioctls/system.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ mod tests {
446446
let kvm = Kvm::new().unwrap();
447447
let mut cpuid = kvm.get_supported_cpuid(KVM_MAX_CPUID_ENTRIES).unwrap();
448448
let cpuid_entries = cpuid.as_mut_slice();
449-
assert!(cpuid_entries.len() > 0);
449+
assert!(!cpuid_entries.is_empty());
450450
assert!(cpuid_entries.len() <= KVM_MAX_CPUID_ENTRIES);
451451
}
452452

@@ -456,7 +456,7 @@ mod tests {
456456
let kvm = Kvm::new().unwrap();
457457
let mut cpuid = kvm.get_emulated_cpuid(KVM_MAX_CPUID_ENTRIES).unwrap();
458458
let cpuid_entries = cpuid.as_mut_slice();
459-
assert!(cpuid_entries.len() > 0);
459+
assert!(!cpuid_entries.is_empty());
460460
assert!(cpuid_entries.len() <= KVM_MAX_CPUID_ENTRIES);
461461
}
462462

src/ioctls/vcpu.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ mod tests {
12031203
panic!("mmap failed.");
12041204
}
12051205

1206-
return addr as *mut u8;
1206+
addr as *mut u8
12071207
}
12081208

12091209
#[test]
@@ -1443,7 +1443,7 @@ mod tests {
14431443
// Get a mutable slice of `mem_size` from `load_addr`.
14441444
// This is safe because we mapped it before.
14451445
let mut slice = std::slice::from_raw_parts_mut(load_addr, mem_size);
1446-
slice.write(&code).unwrap();
1446+
slice.write_all(&code).unwrap();
14471447
}
14481448

14491449
let vcpu_fd = vm.create_vcpu(0).unwrap();
@@ -1488,10 +1488,10 @@ mod tests {
14881488
// * one when the code itself is loaded in memory;
14891489
// * and one more from the `movl` that writes to address 0x8000
14901490
let dirty_pages_bitmap = vm.get_dirty_log(slot, mem_size).unwrap();
1491-
let dirty_pages = dirty_pages_bitmap
1491+
let dirty_pages: u32 = dirty_pages_bitmap
14921492
.into_iter()
14931493
.map(|page| page.count_ones())
1494-
.fold(0, |dirty_page_count, i| dirty_page_count + i);
1494+
.sum();
14951495
assert_eq!(dirty_pages, 2);
14961496
break;
14971497
}
@@ -1573,10 +1573,7 @@ mod tests {
15731573
badf_errno
15741574
);
15751575
assert_eq!(
1576-
faulty_vcpu_fd
1577-
.set_msrs(&mut Msrs::new(1))
1578-
.unwrap_err()
1579-
.errno(),
1576+
faulty_vcpu_fd.set_msrs(&Msrs::new(1)).unwrap_err().errno(),
15801577
badf_errno
15811578
);
15821579
assert_eq!(

src/kvm_ioctls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ mod tests {
211211
use vmm_sys_util::ioctl::{ioctl, ioctl_with_val};
212212

213213
use super::*;
214-
const KVM_PATH: &'static str = "/dev/kvm\0";
214+
const KVM_PATH: &str = "/dev/kvm\0";
215215

216216
#[test]
217217
fn get_version() {

0 commit comments

Comments
 (0)