Column output for list-ports command

AVee · Feb 14, 2025 · 5e9c894 · 5e9c894
1 parent a9fe2d3
commit 5e9c894
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs
@@ -90,8 +90,8 @@ enum Commands {
     HoldInReset(ConnectArgs),
     /// List serial ports available for flashing.
     ///
-    /// The default behavior is to only list ports of devices known to be used on development
-    /// boards.
+    /// The default behavior is to only list ports of devices known to be used
+    /// on development boards.
     ListPorts(ListPortsArgs),
     /// Open the serial monitor without flashing the connected target device
     Monitor(MonitorArgs),

diff --git a/espflash/src/bin/espflash.rs b/espflash/src/bin/espflash.rs
@@ -65,8 +65,8 @@ enum Commands {
     HoldInReset(ConnectArgs),
     /// List serial ports available for flashing.
     ///
-    /// The default behavior is to only list ports of devices known to be used on development
-    /// boards.
+    /// The default behavior is to only list ports of devices known to be used 
+    /// on development boards.
     ListPorts(ListPortsArgs),
     /// Open the serial monitor without flashing the connected target device
     Monitor(MonitorArgs),

diff --git a/espflash/src/cli/mod.rs b/espflash/src/cli/mod.rs
@@ -407,7 +407,7 @@ pub fn list_ports(args: &ListPortsArgs, config: &Config) -> Result<()> {
         let name_width = ports.iter().map(|p| p.port_name.len()).max().unwrap_or(13) + 2;
         let manufacturer_width = ports.iter().filter_map(|p| 
             match &p.port_type {
-                SerialPortType::UsbPort(p) => p.manufacturer.as_ref().map_or(None, |m| Some(m.len())),
+                SerialPortType::UsbPort(p) => p.manufacturer.as_ref().map(|m| m.len()),
                 _ => None
             })
             .max().unwrap_or(15) + 2;