fix: apply cargo fmt formatting

kennethdsheridan · kennethdsheridan · commit 1b2516842a93 · 2026-01-05T16:48:27.000-08:00
diff --git a/src/adapters/secondary/system/linux.rs b/src/adapters/secondary/system/linux.rs
@@ -34,35 +34,12 @@ limitations under the License.
 //! 3. Fallback: sysinfo crate (cross-platform)
 
 use crate::domain::{
-    combine_cpu_info,
-    determine_memory_speed,
-    determine_memory_type,
-    parse_dmidecode_bios_info,
-    parse_dmidecode_chassis_info,
-    parse_dmidecode_cpu,
-    parse_dmidecode_memory,
-    parse_dmidecode_system_info,
-    parse_free_output,
-    parse_hostname_output,
-    parse_ip_output,
-    parse_lscpu_output,
-    BiosInfo,
-    ChassisInfo,
-    CpuInfo,
-    GpuDevice,
-    GpuInfo,
-    GpuVendor,
-    MemoryInfo,
-    MotherboardInfo,
-    NetworkInfo,
-    NetworkInterface,
-    NetworkInterfaceType,
-    NumaNode,
-    StorageDevice,
-    StorageInfo,
-    StorageType,
-    SystemError,
-    SystemInfo,
+    combine_cpu_info, determine_memory_speed, determine_memory_type, parse_dmidecode_bios_info,
+    parse_dmidecode_chassis_info, parse_dmidecode_cpu, parse_dmidecode_memory,
+    parse_dmidecode_system_info, parse_free_output, parse_hostname_output, parse_ip_output,
+    parse_lscpu_output, BiosInfo, ChassisInfo, CpuInfo, GpuDevice, GpuInfo, GpuVendor, MemoryInfo,
+    MotherboardInfo, NetworkInfo, NetworkInterface, NetworkInterfaceType, NumaNode, StorageDevice,
+    StorageInfo, StorageType, SystemError, SystemInfo,
 };
 
 use crate::domain::parsers::storage::{
@@ -156,7 +133,11 @@ impl LinuxSystemInfoProvider {
             // Skip tiny devices (< 1GB)
             const MIN_SIZE: u64 = 1_000_000_000;
             if size_bytes < MIN_SIZE {
-                log::trace!("Skipping small device {}: {} bytes", device_name, size_bytes);
+                log::trace!(
+                    "Skipping small device {}: {} bytes",
+                    device_name,
+                    size_bytes
+                );
                 continue;
             }
 
@@ -273,13 +254,15 @@ impl LinuxSystemInfoProvider {
             ])
             .timeout(Duration::from_secs(10));
 
-        let output = self.command_executor.execute(&cmd).await.map_err(|e| {
-            SystemError::CommandFailed {
-                command: "lsblk".to_string(),
-                exit_code: None,
-                stderr: e.to_string(),
-            }
-        })?;
+        let output =
+            self.command_executor
+                .execute(&cmd)
+                .await
+                .map_err(|e| SystemError::CommandFailed {
+                    command: "lsblk".to_string(),
+                    exit_code: None,
+                    stderr: e.to_string(),
+                })?;
 
         if !output.success {
             return Err(SystemError::CommandFailed {
@@ -331,8 +314,12 @@ impl LinuxSystemInfoProvider {
         for sec_device in secondary {
             if let Some(pri_device) = primary.iter_mut().find(|d| d.name == sec_device.name) {
                 // Fill in missing fields from secondary
-                pri_device.serial_number = pri_device.serial_number.take().or(sec_device.serial_number);
-                pri_device.firmware_version = pri_device.firmware_version.take().or(sec_device.firmware_version);
+                pri_device.serial_number =
+                    pri_device.serial_number.take().or(sec_device.serial_number);
+                pri_device.firmware_version = pri_device
+                    .firmware_version
+                    .take()
+                    .or(sec_device.firmware_version);
                 pri_device.wwn = pri_device.wwn.take().or(sec_device.wwn);
 
                 if pri_device.model.is_empty() && !sec_device.model.is_empty() {
@@ -400,8 +387,9 @@ impl LinuxSystemInfoProvider {
                     iface.driver = Some(driver_str.clone());
 
                     // Driver version
-                    let version_path =
-                        PathBuf::from("/sys/module").join(&driver_str).join("version");
+                    let version_path = PathBuf::from("/sys/module")
+                        .join(&driver_str)
+                        .join("version");
                     if let Ok(version) = self.read_sysfs_file(&version_path) {
                         iface.driver_version = Some(version.trim().to_string());
                     }
@@ -527,7 +515,10 @@ impl SystemInfoProvider for LinuxSystemInfoProvider {
 
         // Enrich with lsblk
         if let Ok(lsblk_devices) = self.detect_storage_lsblk().await {
-            log::debug!("lsblk found {} devices for additional info", lsblk_devices.len());
+            log::debug!(
+                "lsblk found {} devices for additional info",
+                lsblk_devices.len()
+            );
             self.merge_storage_info(&mut devices, lsblk_devices);
         }
 
@@ -597,8 +588,7 @@ impl SystemInfoProvider for LinuxSystemInfoProvider {
                 if lspci_output.success {
                     let mut gpu_index = 0;
                     for line in lspci_output.stdout.lines() {
-                        if line.to_lowercase().contains("vga")
-                            || line.to_lowercase().contains("3d")
+                        if line.to_lowercase().contains("vga") || line.to_lowercase().contains("3d")
                         {
                             devices.push(GpuDevice {
                                 index: gpu_index,
@@ -634,8 +624,7 @@ impl SystemInfoProvider for LinuxSystemInfoProvider {
             }
         })?;
 
-        let mut interfaces =
-            parse_ip_output(&ip_output.stdout).map_err(SystemError::ParseError)?;
+        let mut interfaces = parse_ip_output(&ip_output.stdout).map_err(SystemError::ParseError)?;
 
         // Enrich with sysfs data
         for iface in &mut interfaces {
diff --git a/src/domain/errors.rs b/src/domain/errors.rs
@@ -142,18 +142,13 @@ pub enum SystemError {
     /// I/O operation failed (simple)
     IoError(String),
     /// I/O operation failed (with path context)
-    IoErrorWithPath {
-        path: String,
-        message: String,
-    },
+    IoErrorWithPath { path: String, message: String },
     /// Parsing error
     ParseError(String),
     /// Timeout
     Timeout(String),
     /// Resource not available
-    NotAvailable {
-        resource: String,
-    },
+    NotAvailable { resource: String },
 }
 
 impl fmt::Display for SystemError {
diff --git a/src/domain/parsers/cpu.rs b/src/domain/parsers/cpu.rs
@@ -54,7 +54,7 @@ pub fn parse_sysfs_freq_khz(content: &str) -> Result<u32, String> {
 /// Size in KB.
 pub fn parse_sysfs_cache_size(content: &str) -> Result<u32, String> {
     let trimmed = content.trim();
-    
+
     if trimmed.ends_with('K') || trimmed.ends_with('k') {
         let value: u32 = trimmed[..trimmed.len() - 1]
             .parse()
@@ -83,12 +83,12 @@ pub fn parse_sysfs_cache_size(content: &str) -> Result<u32, String> {
 /// * `content` - Content of /proc/cpuinfo
 pub fn parse_proc_cpuinfo(content: &str) -> Result<CpuInfo, String> {
     let mut cpu_info = CpuInfo::default();
-    
+
     for line in content.lines() {
         if let Some((key, value)) = line.split_once(':') {
             let key = key.trim();
             let value = value.trim();
-            
+
             match key {
                 "vendor_id" => cpu_info.vendor = value.to_string(),
                 "model name" => {
@@ -115,7 +115,7 @@ pub fn parse_proc_cpuinfo(content: &str) -> Result<CpuInfo, String> {
             }
         }
     }
-    
+
     Ok(cpu_info)
 }
 
diff --git a/src/domain/parsers/gpu.rs b/src/domain/parsers/gpu.rs
@@ -108,15 +108,15 @@ pub fn parse_lspci_gpu_output(output: &str) -> Result<Vec<GpuDevice>, String> {
 
     for line in output.lines() {
         let line_lower = line.to_lowercase();
-        
+
         // Look for VGA compatible or 3D controller
         if !line_lower.contains("vga") && !line_lower.contains("3d") {
             continue;
         }
 
         // Extract PCI ID from brackets like [10de:2204]
         let pci_id = extract_pci_id(line);
-        
+
         // Determine vendor from PCI ID
         let (vendor_enum, vendor_name) = if let Some(ref pci) = pci_id {
             let vendor_id = pci.split(':').next().unwrap_or("");
@@ -161,13 +161,13 @@ fn extract_pci_id(line: &str) -> Option<String> {
         let abs_start = search_start + start;
         if let Some(end) = line[abs_start..].find(']') {
             let bracket_content = &line[abs_start + 1..abs_start + end];
-            
+
             // Check if it looks like a PCI ID (4 hex chars : 4 hex chars)
             if bracket_content.len() == 9 && bracket_content.chars().nth(4) == Some(':') {
                 // Verify it's all hex chars
                 let parts: Vec<&str> = bracket_content.split(':').collect();
-                if parts.len() == 2 
-                    && parts[0].len() == 4 
+                if parts.len() == 2
+                    && parts[0].len() == 4
                     && parts[1].len() == 4
                     && parts[0].chars().all(|c| c.is_ascii_hexdigit())
                     && parts[1].chars().all(|c| c.is_ascii_hexdigit())
@@ -191,7 +191,7 @@ mod tests {
     fn test_parse_nvidia_smi_output() {
         let output = "0, NVIDIA GeForce RTX 3090, GPU-12345678-1234-1234-1234-123456789012, 24576, 24000, 00000000:01:00.0, 535.129.03, 8.6";
         let devices = parse_nvidia_smi_output(output).unwrap();
-        
+
         assert_eq!(devices.len(), 1);
         assert_eq!(devices[0].name, "NVIDIA GeForce RTX 3090");
         assert_eq!(devices[0].memory_total_mb, 24576);
@@ -202,9 +202,9 @@ mod tests {
     fn test_parse_lspci_gpu_output() {
         let output = r#"01:00.0 VGA compatible controller [0300]: NVIDIA Corporation GA102 [GeForce RTX 3090] [10de:2204] (rev a1)
 00:02.0 VGA compatible controller [0300]: Intel Corporation Device [8086:9a49] (rev 01)"#;
-        
+
         let devices = parse_lspci_gpu_output(output).unwrap();
-        
+
         assert_eq!(devices.len(), 2);
         assert_eq!(devices[0].vendor, "NVIDIA");
         assert_eq!(devices[1].vendor, "Intel");
@@ -213,7 +213,10 @@ mod tests {
     #[test]
     fn test_extract_pci_id() {
         assert_eq!(extract_pci_id("[10de:2204]"), Some("10de:2204".to_string()));
-        assert_eq!(extract_pci_id("NVIDIA [10de:2204] (rev a1)"), Some("10de:2204".to_string()));
+        assert_eq!(
+            extract_pci_id("NVIDIA [10de:2204] (rev a1)"),
+            Some("10de:2204".to_string())
+        );
         assert_eq!(extract_pci_id("No PCI ID here"), None);
     }
 }
diff --git a/src/domain/parsers/storage.rs b/src/domain/parsers/storage.rs
@@ -75,8 +75,8 @@ pub fn is_virtual_device(name: &str) -> bool {
 ///
 /// * `output` - JSON output from `lsblk -J -b -d -o NAME,SIZE,TYPE,MODEL,SERIAL,ROTA,TRAN,WWN`
 pub fn parse_lsblk_json(output: &str) -> Result<Vec<StorageDevice>, String> {
-    let json: serde_json::Value = serde_json::from_str(output)
-        .map_err(|e| format!("Failed to parse lsblk JSON: {}", e))?;
+    let json: serde_json::Value =
+        serde_json::from_str(output).map_err(|e| format!("Failed to parse lsblk JSON: {}", e))?;
 
     let blockdevices = json
         .get("blockdevices")
@@ -97,10 +97,7 @@ pub fn parse_lsblk_json(output: &str) -> Result<Vec<StorageDevice>, String> {
             continue;
         }
 
-        let size_bytes = device
-            .get("size")
-            .and_then(|v| v.as_u64())
-            .unwrap_or(0);
+        let size_bytes = device.get("size").and_then(|v| v.as_u64()).unwrap_or(0);
 
         // Skip small devices
         if size_bytes < 1_000_000_000 {
