Cargo Clippy

Author: HaydnTrigg

crates/delink-macho/src/lib.rs

@@ -267,28 +267,26 @@ fn parse_stubs_32(data: &[u8]) -> Result<HashMap<u64, String>> {
                         u32::from_le_bytes(data[pos + 60..pos + 64].try_into().unwrap());
                 }
             }
-            LC_SEGMENT => {
-                if cmdsize >= SEGMENT_CMD32_SIZE {
-                    // nsects at offset 48 within segment_command_32
-                    let nsects =
-                        u32::from_le_bytes(data[pos + 48..pos + 52].try_into().unwrap()) as usize;
-                    for i in 0..nsects {
-                        let sec_base = pos + SEGMENT_CMD32_SIZE + i * SECTION32_SIZE;
-                        if sec_base + SECTION32_SIZE > cmds_end {
-                            break;
-                        }
-                        let sec = &data[sec_base..sec_base + SECTION32_SIZE];
-                        // section_32: addr[32..36] size[36..40] flags[56..60]
-                        //             reserved1[60..64] reserved2[64..68]
-                        let flags = u32::from_le_bytes(sec[56..60].try_into().unwrap());
-                        if flags & SECTION_TYPE == S_SYMBOL_STUBS {
-                            let addr = u32::from_le_bytes(sec[32..36].try_into().unwrap()) as u64;
-                            let size = u32::from_le_bytes(sec[36..40].try_into().unwrap()) as u64;
-                            let reserved1 = u32::from_le_bytes(sec[60..64].try_into().unwrap());
-                            let reserved2 = u32::from_le_bytes(sec[64..68].try_into().unwrap());
-                            if reserved2 > 0 && size > 0 {
-                                stub_secs.push((addr, size, reserved1, reserved2));
-                            }
+            LC_SEGMENT if cmdsize >= SEGMENT_CMD32_SIZE => {
+                // nsects at offset 48 within segment_command_32
+                let nsects =
+                    u32::from_le_bytes(data[pos + 48..pos + 52].try_into().unwrap()) as usize;
+                for i in 0..nsects {
+                    let sec_base = pos + SEGMENT_CMD32_SIZE + i * SECTION32_SIZE;
+                    if sec_base + SECTION32_SIZE > cmds_end {
+                        break;
+                    }
+                    let sec = &data[sec_base..sec_base + SECTION32_SIZE];
+                    // section_32: addr[32..36] size[36..40] flags[56..60]
+                    //             reserved1[60..64] reserved2[64..68]
+                    let flags = u32::from_le_bytes(sec[56..60].try_into().unwrap());
+                    if flags & SECTION_TYPE == S_SYMBOL_STUBS {
+                        let addr = u32::from_le_bytes(sec[32..36].try_into().unwrap()) as u64;
+                        let size = u32::from_le_bytes(sec[36..40].try_into().unwrap()) as u64;
+                        let reserved1 = u32::from_le_bytes(sec[60..64].try_into().unwrap());
+                        let reserved2 = u32::from_le_bytes(sec[64..68].try_into().unwrap());
+                        if reserved2 > 0 && size > 0 {
+                            stub_secs.push((addr, size, reserved1, reserved2));
                         }
                     }
                 }

crates/delink-macho/src/symtab_json.rs

@@ -369,7 +369,7 @@ fn sanitize_filename(name: &str) -> String {
             }
         })
         .collect();
-    let trimmed = s.trim_start_matches(|c: char| c == '.' || c == '_');
+    let trimmed = s.trim_start_matches(['.', '_']);
     let truncated = &trimmed[..trimmed.len().min(200)];
     if truncated.is_empty() {
         "unknown".to_string()

crates/delink-macho/src/symtab_split.rs

@@ -79,8 +79,6 @@ pub fn build_cu_index_from_symtab(data: &[u8]) -> Result<MachoCuIndex> {
 
     // Group into batches and build CUs.
     let mut units = Vec::new();
-    let mut cu_id = 0usize;
-
     for (batch_idx, batch) in fns.chunks(BATCH_SIZE).enumerate() {
         let batch_start = batch_idx * BATCH_SIZE;
         let functions: Vec<MachoFunction> = batch
@@ -104,15 +102,14 @@ pub fn build_cu_index_from_symtab(data: &[u8]) -> Result<MachoCuIndex> {
         let cu_name = functions[0].name.clone();
 
         units.push(MachoCompilationUnit {
-            id: cu_id,
+            id: batch_idx,
             name: cu_name,
             comp_dir: None,
             oso_path: None,
             ranges,
             functions,
             variables: vec![],
         });
-        cu_id += 1;
     }
 
     Ok(MachoCuIndex { units })