summary refs log tree commit diff
path: root/src/main.rs
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-04-12 19:22:33 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-17 17:22:53 -0700
commit5fb3f5151731df314637ef82976367db2df14e66 (patch)
treecfefd7ab6a6f99383c0585f7005ab01bfc586009 /src/main.rs
parent56c2d3631c3125b02479dc0d3b2b488fb3363b65 (diff)
downloadcrosvm-5fb3f5151731df314637ef82976367db2df14e66.tar
crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.gz
crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.bz2
crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.lz
crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.xz
crosvm-5fb3f5151731df314637ef82976367db2df14e66.tar.zst
crosvm-5fb3f5151731df314637ef82976367db2df14e66.zip
clippy: Resolve redundant_closure
TEST=bin/clippy

Change-Id: Id4f38956d788e4402df164df03e80c4b487b1ad6
Reviewed-on: https://chromium-review.googlesource.com/1566745
Commit-Ready: David Tolnay <dtolnay@chromium.org>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs
index c8cb2ea..9906e47 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1047,7 +1047,7 @@ fn raw_fd_from_path(path: &Path) -> ModifyUsbResult<RawFd> {
                 })
             },
         )?;
-    validate_raw_fd(raw_fd).map_err(|e| ModifyUsbError::FailedFdValidate(e))
+    validate_raw_fd(raw_fd).map_err(ModifyUsbError::FailedFdValidate)
 }
 
 fn usb_attach(mut args: std::env::Args) -> ModifyUsbResult<UsbControlResult> {
@@ -1080,7 +1080,7 @@ fn usb_attach(mut args: std::env::Args) -> ModifyUsbResult<UsbControlResult> {
         addr,
         vid,
         pid,
-        fd: usb_file.map(|f| MaybeOwnedFd::Owned(f)),
+        fd: usb_file.map(MaybeOwnedFd::Owned),
     });
     let response = handle_request(&request, args).map_err(|_| ModifyUsbError::SocketFailed)?;
     match response {