From 72bb255ff6e4f10bec15f5a4f1825d9c0b6501e0 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 20 Nov 2020 12:26:11 +0100 Subject: [PATCH] pci, virtio-devices: Fix rust 1.48 clippy warnings Unnecessary closure used to substitute value for `Option::None` See https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_lazy_evaluations Signed-off-by: Samuel Ortiz --- pci/src/configuration.rs | 6 +++--- pci/src/vfio.rs | 6 +++--- virtio-devices/src/vhost_user/vu_common_ctrl.rs | 6 +++--- virtio-devices/src/vsock/packet.rs | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pci/src/configuration.rs b/pci/src/configuration.rs index a27e67a0b..b0f8d2b4b 100644 --- a/pci/src/configuration.rs +++ b/pci/src/configuration.rs @@ -570,7 +570,7 @@ impl PciConfiguration { let end_addr = config .addr .checked_add(config.size - 1) - .ok_or_else(|| Error::BarAddressInvalid(config.addr, config.size))?; + .ok_or(Error::BarAddressInvalid(config.addr, config.size))?; match config.region_type { PciBarRegionType::Memory32BitRegion | PciBarRegionType::IORegion => { if end_addr > u64::from(u32::max_value()) { @@ -642,7 +642,7 @@ impl PciConfiguration { let end_addr = config .addr .checked_add(config.size - 1) - .ok_or_else(|| Error::RomBarAddressInvalid(config.addr, config.size))?; + .ok_or(Error::RomBarAddressInvalid(config.addr, config.size))?; if end_addr > u64::from(u32::max_value()) { return Err(Error::RomBarAddressInvalid(config.addr, config.size)); @@ -698,7 +698,7 @@ impl PciConfiguration { }; let end_offset = cap_offset .checked_add(total_len) - .ok_or_else(|| Error::CapabilitySpaceFull(total_len))?; + .ok_or(Error::CapabilitySpaceFull(total_len))?; if end_offset > CAPABILITY_MAX_OFFSET { return Err(Error::CapabilitySpaceFull(total_len)); } diff --git a/pci/src/vfio.rs b/pci/src/vfio.rs index 9b84f2950..ff3910ab8 100644 --- a/pci/src/vfio.rs +++ b/pci/src/vfio.rs @@ -750,7 +750,7 @@ impl PciDevice for VfioPciDevice { // The address needs to be 4 bytes aligned. bar_addr = allocator .allocate_io_addresses(None, region_size, Some(0x4)) - .ok_or_else(|| PciDeviceError::IoAllocationFailed(region_size))?; + .ok_or(PciDeviceError::IoAllocationFailed(region_size))?; } #[cfg(target_arch = "aarch64")] unimplemented!() @@ -797,11 +797,11 @@ impl PciDevice for VfioPciDevice { if is_64bit_bar { bar_addr = allocator .allocate_mmio_addresses(None, region_size, Some(bar_alignment)) - .ok_or_else(|| PciDeviceError::IoAllocationFailed(region_size))?; + .ok_or(PciDeviceError::IoAllocationFailed(region_size))?; } else { bar_addr = allocator .allocate_mmio_hole_addresses(None, region_size, Some(bar_alignment)) - .ok_or_else(|| PciDeviceError::IoAllocationFailed(region_size))?; + .ok_or(PciDeviceError::IoAllocationFailed(region_size))?; } } diff --git a/virtio-devices/src/vhost_user/vu_common_ctrl.rs b/virtio-devices/src/vhost_user/vu_common_ctrl.rs index f17e25ffb..752671ed7 100644 --- a/virtio-devices/src/vhost_user/vu_common_ctrl.rs +++ b/virtio-devices/src/vhost_user/vu_common_ctrl.rs @@ -77,15 +77,15 @@ pub fn setup_vhost_user_vring( queue.desc_table, actual_size * std::mem::size_of::(), ) - .ok_or_else(|| Error::DescriptorTableAddress)? as u64, + .ok_or(Error::DescriptorTableAddress)? as u64, // The used ring is {flags: u16; idx: u16; virtq_used_elem [{id: u16, len: u16}; actual_size]}, // i.e. 4 + (4 + 4) * actual_size. used_ring_addr: get_host_address_range(mem, queue.used_ring, 4 + actual_size * 8) - .ok_or_else(|| Error::UsedAddress)? as u64, + .ok_or(Error::UsedAddress)? as u64, // The used ring is {flags: u16; idx: u16; elem [u16; actual_size]}, // i.e. 4 + (2) * actual_size. avail_ring_addr: get_host_address_range(mem, queue.avail_ring, 4 + actual_size * 2) - .ok_or_else(|| Error::AvailAddress)? as u64, + .ok_or(Error::AvailAddress)? as u64, log_addr: None, }; diff --git a/virtio-devices/src/vsock/packet.rs b/virtio-devices/src/vsock/packet.rs index 64edc79af..7edcc5abe 100644 --- a/virtio-devices/src/vsock/packet.rs +++ b/virtio-devices/src/vsock/packet.rs @@ -118,7 +118,7 @@ impl VsockPacket { let mut pkt = Self { hdr: get_host_address_range(head.mem, head.addr, VSOCK_PKT_HDR_SIZE) - .ok_or_else(|| VsockError::GuestMemory)? as *mut u8, + .ok_or(VsockError::GuestMemory)? as *mut u8, buf: None, buf_size: 0, }; @@ -151,7 +151,7 @@ impl VsockPacket { pkt.buf_size = buf_desc.len as usize; pkt.buf = Some( get_host_address_range(buf_desc.mem, buf_desc.addr, pkt.buf_size) - .ok_or_else(|| VsockError::GuestMemory)? as *mut u8, + .ok_or(VsockError::GuestMemory)? as *mut u8, ); Ok(pkt) @@ -183,10 +183,10 @@ impl VsockPacket { Ok(Self { hdr: get_host_address_range(head.mem, head.addr, VSOCK_PKT_HDR_SIZE) - .ok_or_else(|| VsockError::GuestMemory)? as *mut u8, + .ok_or(VsockError::GuestMemory)? as *mut u8, buf: Some( get_host_address_range(buf_desc.mem, buf_desc.addr, buf_size) - .ok_or_else(|| VsockError::GuestMemory)? as *mut u8, + .ok_or(VsockError::GuestMemory)? as *mut u8, ), buf_size, })