clippy: Resolve block_in_if_condition_stmt

TEST=bin/clippy

Change-Id: I36153632fbe21e8e23a36f0522b7afa1a72b5192
Reviewed-on: https://chromium-review.googlesource.com/1566658
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>

2 files changed, 13 insertions, 13 deletions

diff --git a/bin/clippy b/bin/clippy
index c370bd2..6bc59aa 100755
--- a/bin/clippy
+++ b/bin/clippy
@@ -13,7 +13,6 @@ cd ..
 
 SUPPRESS=(
     # To be resolved.
-    block_in_if_condition_stmt
     clone_on_copy
     collapsible_if
     const_static_lifetime
diff --git a/devices/src/usb/xhci/usb_hub.rs b/devices/src/usb/xhci/usb_hub.rs
index d5c532e..ae4f2f8 100644
--- a/devices/src/usb/xhci/usb_hub.rs
+++ b/devices/src/usb/xhci/usb_hub.rs
@@ -208,21 +208,22 @@ impl UsbHub {
     /// Try to detach device of bus, addr, vid, pid
     pub fn try_detach(&self, bus: u8, addr: u8, vid: u16, pid: u16) -> Result<()> {
         for port in &self.ports {
-            if !port
-                .get_backend_device()
-                .as_ref()
-                .map(|d| {
-                    d.host_bus() == bus
-                        && d.host_address() == addr
-                        && d.get_vid() == vid
-                        && d.get_pid() == pid
-                })
-                .unwrap_or(false)
+            let backend_device = port.get_backend_device();
+
+            let d = match backend_device.as_ref() {
+                None => continue,
+                Some(d) => d,
+            };
+
+            if d.host_bus() == bus
+                && d.host_address() == addr
+                && d.get_vid() == vid
+                && d.get_pid() == pid
             {
-                continue;
+                return port.detach();
             }
-            return port.detach();
         }
+
         Err(Error::NoSuchDevice {
             bus,
             addr,