From 274f1aa2e738d579ffff9d4cfd7ed7c45293af31 Mon Sep 17 00:00:00 2001 From: Muminul Islam Date: Wed, 18 Oct 2023 10:42:26 -0700 Subject: [PATCH] virtio-devices,vm-allocator: Fix clippy warnings Signed-off-by: Muminul Islam --- virtio-devices/src/block.rs | 4 +++- vm-allocator/src/system.rs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/virtio-devices/src/block.rs b/virtio-devices/src/block.rs index 5d7f89298..a580b40f2 100644 --- a/virtio-devices/src/block.rs +++ b/virtio-devices/src/block.rs @@ -616,7 +616,9 @@ impl Block { (disk_nsectors, avail_features, 0, config, false) }; - let serial = serial.map(Vec::from).unwrap_or(build_serial(&disk_path)); + let serial = serial + .map(Vec::from) + .unwrap_or_else(|| build_serial(&disk_path)); Ok(Block { common: VirtioCommon { diff --git a/vm-allocator/src/system.rs b/vm-allocator/src/system.rs index 96437f9a6..cb7770b2d 100644 --- a/vm-allocator/src/system.rs +++ b/vm-allocator/src/system.rs @@ -119,7 +119,7 @@ impl SystemAllocator { self.platform_mmio_address_space.allocate( address, size, - Some(align_size.unwrap_or(get_page_size())), + Some(align_size.unwrap_or_else(get_page_size)), ) } @@ -133,7 +133,7 @@ impl SystemAllocator { self.mmio_hole_address_space.allocate( address, size, - Some(align_size.unwrap_or(get_page_size())), + Some(align_size.unwrap_or_else(get_page_size)), ) }