Merge branch 'main' into map-filter

Author: encounter

deny.toml

@@ -77,6 +77,7 @@ ignore = [
     { id = "RUSTSEC-2025-0052", reason = "Unmaintained async-std crate is an indirect dependency" },
     { id = "RUSTSEC-2025-0119", reason = "Unmaintained number_prefix crate is an indirect dependency" },
     { id = "RUSTSEC-2025-0134", reason = "Unmaintained rustls-pemfile crate is an indirect dependency" },
+    { id = "RUSTSEC-2026-0002", reason = "Unsound advisory in lru indirect dependency" },
 ]
 # If this is true, then cargo deny will use the git executable to fetch advisory database.
 # If this is false, then it uses a built-in git library.

objdiff-core/src/diff/display.rs

@@ -298,9 +298,8 @@ pub fn display_row(
         }
     })?;
     // Fallback for relocation that wasn't displayed
-    if resolved.relocation.is_some() && !displayed_relocation {
+    if !displayed_relocation && let Some(resolved) = resolved.relocation {
         cb(DiffTextSegment::basic(" <", base_color))?;
-        let resolved = resolved.relocation.unwrap();
         let diff_index = ins_row.arg_diff.get(arg_idx).copied().unwrap_or_default();
         let color =
             diff_index.get().map_or(DiffTextColor::Bright, |i| DiffTextColor::Rotating(i as u8));