From c04f1048d5cfba053783ccb40a18e5cce0823f69 Mon Sep 17 00:00:00 2001 From: Ruoqing He Date: Fri, 6 Jun 2025 13:08:43 +0000 Subject: [PATCH] dragonball: Fix clippy `unnecessary_lazy_evaluations` Fix `unnecessary_lazy_evaluations` clippy warning as suggested by rust 1.85.1. ```console error: unnecessary closure used to substitute value for `Option::None` --> dbs_virtio_devices/src/vhost/vhost_user/block.rs:225:28 | 225 | let vhost_socket = config_path | ____________________________^ 226 | | .strip_prefix("spdk://") 227 | | .ok_or_else(|| VirtIoError::InvalidInput)? | |_____________________________________________________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_lazy_evaluations = note: `-D clippy::unnecessary-lazy-evaluations` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::unnecessary_lazy_evaluations)]` help: use `ok_or` instead | 227 | .ok_or(VirtIoError::InvalidInput)? | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` Signed-off-by: Ruoqing He unnecessary_lazy_evaluations Signed-off-by: Ruoqing He --- src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/block.rs | 2 +- src/dragonball/src/device_manager/balloon_dev_mgr.rs | 2 +- src/dragonball/src/device_manager/mem_dev_mgr.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/block.rs b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/block.rs index 1ac00b2da7..ad3817174e 100644 --- a/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/block.rs +++ b/src/dragonball/dbs_virtio_devices/src/vhost/vhost_user/block.rs @@ -224,7 +224,7 @@ impl VhostUserBlockDevice { // config_path = "spdk://xxxxxxx.sock", remove the prefix "spdk://" let vhost_socket = config_path .strip_prefix("spdk://") - .ok_or_else(|| VirtIoError::InvalidInput)? + .ok_or(VirtIoError::InvalidInput)? .to_string(); let init_queues = queue_sizes.len() as u32; diff --git a/src/dragonball/src/device_manager/balloon_dev_mgr.rs b/src/dragonball/src/device_manager/balloon_dev_mgr.rs index fcac989155..8e1bca49a9 100644 --- a/src/dragonball/src/device_manager/balloon_dev_mgr.rs +++ b/src/dragonball/src/device_manager/balloon_dev_mgr.rs @@ -253,7 +253,7 @@ impl BalloonDeviceMgr { let device = self.info_list[index] .device .as_ref() - .ok_or_else(|| BalloonDeviceError::NotExist)?; + .ok_or(BalloonDeviceError::NotExist)?; if let Some(mmio_dev) = device.as_any().downcast_ref::() { let guard = mmio_dev.state(); let inner_dev = guard.get_inner_device(); diff --git a/src/dragonball/src/device_manager/mem_dev_mgr.rs b/src/dragonball/src/device_manager/mem_dev_mgr.rs index 891149f25a..b344332fc2 100644 --- a/src/dragonball/src/device_manager/mem_dev_mgr.rs +++ b/src/dragonball/src/device_manager/mem_dev_mgr.rs @@ -325,7 +325,7 @@ impl MemDeviceMgr { let device = self.info_list[index] .device .as_ref() - .ok_or_else(|| MemDeviceError::DeviceNotExist)?; + .ok_or(MemDeviceError::DeviceNotExist)?; if let Some(mmio_dev) = device.as_any().downcast_ref::() { let guard = mmio_dev.state(); let inner_dev = guard.get_inner_device();