From d7dfab92be2bbed3c539547f3d2f55fac3bce8ad Mon Sep 17 00:00:00 2001
From: Ruoqing He <heruoqing@iscas.ac.cn>
Date: Wed, 4 Jun 2025 16:54:39 +0000
Subject: [PATCH] runtime-rs: Fix clippy `manual_inspect`

Manually fix `manual_inspect` clippy warning reported by rust 1.85.1.

```console
error: using `map` over `inspect`
  --> crates/resource/src/cdi_devices/container_device.rs:50:10
   |
50 |         .map(|device| {
   |          ^^^
   |
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_inspect
   = note: `-D clippy::manual-inspect` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(clippy::manual_inspect)]`
help: try
   |
50 ~         .inspect(|device| {
51 |             // push every device's Device to agent_devices
52 ~             devices_agent.push(device.device.clone());
   |
```

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
---
 src/runtime-rs/crates/hypervisor/src/dragonball/inner.rs     | 5 +----
 src/runtime-rs/crates/hypervisor/src/firecracker/fc_api.rs   | 5 ++---
 .../crates/hypervisor/src/firecracker/inner_hypervisor.rs    | 5 ++---
 .../crates/resource/src/cdi_devices/container_device.rs      | 5 ++---
 .../crates/resource/src/share_fs/sandbox_bind_mounts.rs      | 3 +--
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/runtime-rs/crates/hypervisor/src/dragonball/inner.rs b/src/runtime-rs/crates/hypervisor/src/dragonball/inner.rs
index 92637e2bc4..d22b33bfd1 100644
--- a/src/runtime-rs/crates/hypervisor/src/dragonball/inner.rs
+++ b/src/runtime-rs/crates/hypervisor/src/dragonball/inner.rs
@@ -214,10 +214,7 @@ impl DragonballInner {
         }
 
         std::fs::remove_dir_all(&self.vm_path)
-            .map_err(|err| {
-                error!(sl!(), "failed to remove dir all for {}", &self.vm_path);
-                err
-            })
+            .inspect_err(|_| error!(sl!(), "failed to remove dir all for {}", &self.vm_path))
             .ok();
     }
 
diff --git a/src/runtime-rs/crates/hypervisor/src/firecracker/fc_api.rs b/src/runtime-rs/crates/hypervisor/src/firecracker/fc_api.rs
index d9ceae0b77..8da8609da7 100644
--- a/src/runtime-rs/crates/hypervisor/src/firecracker/fc_api.rs
+++ b/src/runtime-rs/crates/hypervisor/src/firecracker/fc_api.rs
@@ -302,12 +302,11 @@ impl FcInner {
             self.umount_jail_resource("").ok();
         }
         std::fs::remove_dir_all(self.vm_path.as_str())
-            .map_err(|err| {
+            .inspect_err(|err| {
                 error!(
                     sl(),
                     "failed to remove dir all for {} with error: {:?}", &self.vm_path, &err
-                );
-                err
+                )
             })
             .ok();
     }
diff --git a/src/runtime-rs/crates/hypervisor/src/firecracker/inner_hypervisor.rs b/src/runtime-rs/crates/hypervisor/src/firecracker/inner_hypervisor.rs
index 2178e7b2f7..bd38385a51 100644
--- a/src/runtime-rs/crates/hypervisor/src/firecracker/inner_hypervisor.rs
+++ b/src/runtime-rs/crates/hypervisor/src/firecracker/inner_hypervisor.rs
@@ -176,12 +176,11 @@ impl FcInner {
         self.cleanup_resource();
 
         std::fs::remove_dir_all(self.vm_path.as_str())
-            .map_err(|err| {
+            .inspect_err(|err| {
                 error!(
                     sl(),
                     "failed to remove dir all for {} with error: {:?}", &self.vm_path, &err
-                );
-                err
+                )
             })
             .ok();
 
diff --git a/src/runtime-rs/crates/resource/src/cdi_devices/container_device.rs b/src/runtime-rs/crates/resource/src/cdi_devices/container_device.rs
index 0e3fb750dd..2c9398c12e 100644
--- a/src/runtime-rs/crates/resource/src/cdi_devices/container_device.rs
+++ b/src/runtime-rs/crates/resource/src/cdi_devices/container_device.rs
@@ -47,10 +47,9 @@ pub fn annotate_container_devices(
     // Step 1: Extract all devices and filter out devices without device_info for vfio_devices
     let vfio_devices: Vec<ContainerDevice> = container_devices
         .into_iter()
-        .map(|device| {
+        .inspect(|device| {
             // push every device's Device to agent_devices
-            devices_agent.push(device.device.clone());
-            device
+            devices_agent.push(device.device.clone())
         })
         .filter(|device| device.device_info.is_some())
         .collect();
diff --git a/src/runtime-rs/crates/resource/src/share_fs/sandbox_bind_mounts.rs b/src/runtime-rs/crates/resource/src/share_fs/sandbox_bind_mounts.rs
index fb63205f07..c3d76d0ebc 100644
--- a/src/runtime-rs/crates/resource/src/share_fs/sandbox_bind_mounts.rs
+++ b/src/runtime-rs/crates/resource/src/share_fs/sandbox_bind_mounts.rs
@@ -103,13 +103,12 @@ impl SandboxBindMounts {
             // mount -o bind,ro host_shared mount_dest
             // host_shared: ${bindmount}
             mount::bind_mount_unchecked(Path::new(bindmount), &mount_dest, true, MsFlags::MS_SLAVE)
-                .map_err(|e| {
+                .inspect_err(|_| {
                     for p in &mounted_list {
                         nix::mount::umount(p).unwrap_or_else(|e| {
                             error!(sl!(), "do umount failed: {:?}", e);
                         });
                     }
-                    e
                 })?;
 
             // default sandbox bind mounts mode is ro.