Update gimli deps

Requires a minor code tweak to account for a breaking change.
rust-lang · May 28, 2024 · e7d8af0 · e7d8af0
1 parent bb54997
commit e7d8af0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/thorin-bin/Cargo.toml b/thorin-bin/Cargo.toml
@@ -24,7 +24,7 @@ tracing-tree = "0.1.10"
 typed-arena = "2.0.1"
 
 [dependencies.object]
-version = "0.32.0"
+version = "0.36.0"
 default-features = false
 features = [ "archive", "read", "write", "compression" ]
 

diff --git a/thorin/Cargo.toml b/thorin/Cargo.toml
@@ -16,14 +16,14 @@ tracing = "0.1.29"
 hashbrown = "0.14.0"
 
 [dependencies.gimli]
-version  = "0.28.0"
+version  = "0.30.0"
 default-features = false
 # `gimli/std` pulls in `fallible-iterator` which we don't use, but can't opt out of, because of
 # cargo#8832.
 features = [ "read", "write", "std" ]
 
 [dependencies.object]
-version = "0.32.0"
+version = "0.36.0"
 default-features = false
 features = [ "archive", "read", "write", "compression" ]
 

diff --git a/thorin/src/package.rs b/thorin/src/package.rs
@@ -237,7 +237,10 @@ where
                 let section = index
                     .sections(row_id)
                     .map_err(|e| Error::RowNotInIndex(e, row_id))?
-                    .find(|index_section| index_section.section == target_section_id)
+                    .find(|index_section| {
+                        // SectionId is a superset of IndexSectionId
+                        Some(index_section.section.dwo_name()) == target_section_id.dwo_name()
+                    })
                     .ok_or(Error::SectionNotInRow)?;
                 let adjusted_offset: u64 = contribution.offset.0 + *adjustment;
                 *adjustment += section.size as u64;