summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-04-12 19:18:32 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-17 17:22:53 -0700
commit56c2d3631c3125b02479dc0d3b2b488fb3363b65 (patch)
tree2c66c10a07031f29293cfbd0f5a2dcc455a3d5b1
parent9239602d69306a45da78a595bed4a02aef105ea5 (diff)
downloadcrosvm-56c2d3631c3125b02479dc0d3b2b488fb3363b65.tar
crosvm-56c2d3631c3125b02479dc0d3b2b488fb3363b65.tar.gz
crosvm-56c2d3631c3125b02479dc0d3b2b488fb3363b65.tar.bz2
crosvm-56c2d3631c3125b02479dc0d3b2b488fb3363b65.tar.lz
crosvm-56c2d3631c3125b02479dc0d3b2b488fb3363b65.tar.xz
crosvm-56c2d3631c3125b02479dc0d3b2b488fb3363b65.tar.zst
crosvm-56c2d3631c3125b02479dc0d3b2b488fb3363b65.zip
clippy: Resolve option_map_unit_fn
TEST=bin/clippy

Change-Id: I814cfce68c147f63d96fce6d0c465488ad3e336a
Reviewed-on: https://chromium-review.googlesource.com/1566744
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>
-rwxr-xr-xbin/clippy1
-rw-r--r--devices/src/virtio/wl.rs6
2 files changed, 3 insertions, 4 deletions
diff --git a/bin/clippy b/bin/clippy
index f2a2a01..cd0ead9 100755
--- a/bin/clippy
+++ b/bin/clippy
@@ -14,7 +14,6 @@ cd ..
 SUPPRESS=(
     # To be resolved.
     let_unit_value
-    option_map_unit_fn
     question_mark
     range_plus_one
     redundant_closure
diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs
index 2352998..08890b0 100644
--- a/devices/src/virtio/wl.rs
+++ b/devices/src/virtio/wl.rs
@@ -1308,9 +1308,9 @@ impl WlState {
         // hangup events.
         for &send_vfd_id in &send_vfd_ids[..vfd_count] {
             if send_vfd_id.kind == VIRTIO_WL_CTRL_VFD_SEND_KIND_LOCAL {
-                self.vfds
-                    .get_mut(&send_vfd_id.id.into())
-                    .map(|vfd| vfd.close_remote());
+                if let Some(vfd) = self.vfds.get_mut(&send_vfd_id.id.into()) {
+                    vfd.close_remote();
+                }
             }
         }
         Ok(WlResp::Ok)