Minor cleanup

Author: encounter

objdiff-core/src/diff/data.rs

@@ -41,11 +41,9 @@ pub fn symbol_name_matches(left_name: &str, right_name: &str) -> bool {
         if !suffix.chars().all(char::is_numeric) {
             return false;
         }
-        if let Some((p, s)) = right_name.split_once('$') {
-            prefix == p && s.chars().all(char::is_numeric)
-        } else {
-            false
-        }
+        right_name
+            .split_once('$')
+            .is_some_and(|(p, s)| p == prefix && s.chars().all(char::is_numeric))
     } else {
         left_name == right_name
     }

objdiff-core/src/diff/mod.rs

@@ -651,11 +651,8 @@ where
 fn symbol_section<'obj>(obj: &'obj Object, symbol: &Symbol) -> Option<(&'obj str, SectionKind)> {
     if let Some(section) = symbol.section.and_then(|section_idx| obj.sections.get(section_idx)) {
         // Match x86 .rdata$r against .rdata$rs
-        let section_name = if let Some((prefix, _)) = section.name.split_once('$') {
-            prefix
-        } else {
-            section.name.as_str()
-        };
+        let section_name =
+            section.name.split_once('$').map_or(section.name.as_str(), |(prefix, _)| prefix);
         Some((section_name, section.kind))
     } else if symbol.flags.contains(SymbolFlag::Common) {
         Some((".comm", SectionKind::Common))
@@ -664,13 +661,6 @@ fn symbol_section<'obj>(obj: &'obj Object, symbol: &Symbol) -> Option<(&'obj str
     }
 }
 
-fn symbol_section_name<'obj>(obj: &'obj Object, symbol: &Symbol) -> Option<&'obj str> {
-    if let Some((name, _kind)) = symbol_section(obj, symbol) {
-        return Some(name);
-    }
-    None
-}
-
 fn symbol_section_kind(obj: &Object, symbol: &Symbol) -> SectionKind {
     match symbol.section {
         Some(section_index) => obj.sections[section_index].kind,
@@ -762,7 +752,7 @@ fn find_symbol(
     if let Some((symbol_idx, _)) = unmatched_symbols(obj, used).find(|&(_, symbol)| {
         symbol_name_matches(&in_symbol.name, &symbol.name)
             && symbol_section_kind(obj, symbol) == section_kind
-            && symbol_section_name(obj, symbol) == Some(section_name)
+            && symbol_section(obj, symbol).is_some_and(|(name, _)| name == section_name)
     }) {
         return Some(symbol_idx);
     }