From c9822becc3a4e92116605bc071c32373736fb6bc Mon Sep 17 00:00:00 2001
From: Martin Ling <martin-git@earth.li>
Date: Fri, 20 Sep 2024 18:36:10 +0100
Subject: [PATCH] Replace .map() + .flatten() with .and_then()

---
 src/platform/linux_usbfs/enumeration.rs    | 5 +----
 src/platform/windows_winusb/enumeration.rs | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/platform/linux_usbfs/enumeration.rs b/src/platform/linux_usbfs/enumeration.rs
index 9cc04e8..7e74388 100644
--- a/src/platform/linux_usbfs/enumeration.rs
+++ b/src/platform/linux_usbfs/enumeration.rs
@@ -175,10 +175,7 @@ pub fn list_buses() -> Result<impl Iterator<Item = BusInfo>, Error> {
             path: rh.path.to_owned(),
             parent_path: parent_path.to_owned(),
             busnum: rh.busnum,
-            controller_type: driver
-                .as_ref()
-                .map(|p| UsbControllerType::from_str(p))
-                .flatten(),
+            controller_type: driver.as_ref().and_then(|p| UsbControllerType::from_str(p)),
             driver,
             root_hub: rh,
         })
diff --git a/src/platform/windows_winusb/enumeration.rs b/src/platform/windows_winusb/enumeration.rs
index bb90904..0aca8bc 100644
--- a/src/platform/windows_winusb/enumeration.rs
+++ b/src/platform/windows_winusb/enumeration.rs
@@ -404,8 +404,7 @@ fn parse_root_hub_id(s: &OsStr) -> Option<(u16, Option<String>)> {
         .unwrap_or((0x0110, 0)); // default USB 1.1
     let id = s
         .get(i..)
-        .map(|v| v.strip_prefix("\\").map(|s| s.to_owned()))
-        .flatten();
+        .and_then(|v| v.strip_prefix("\\").map(|s| s.to_owned()));
     Some((version, id))
 }