Skip to content

Commit e7d8af0

Browse files
Update gimli deps
Requires a minor code tweak to account for a breaking change.
1 parent bb54997 commit e7d8af0

File tree

4 files changed

+27
-33
lines changed

4 files changed

+27
-33
lines changed

Cargo.lock

Lines changed: 20 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

thorin-bin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tracing-tree = "0.1.10"
2424
typed-arena = "2.0.1"
2525

2626
[dependencies.object]
27-
version = "0.32.0"
27+
version = "0.36.0"
2828
default-features = false
2929
features = [ "archive", "read", "write", "compression" ]
3030

thorin/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ tracing = "0.1.29"
1616
hashbrown = "0.14.0"
1717

1818
[dependencies.gimli]
19-
version = "0.28.0"
19+
version = "0.30.0"
2020
default-features = false
2121
# `gimli/std` pulls in `fallible-iterator` which we don't use, but can't opt out of, because of
2222
# cargo#8832.
2323
features = [ "read", "write", "std" ]
2424

2525
[dependencies.object]
26-
version = "0.32.0"
26+
version = "0.36.0"
2727
default-features = false
2828
features = [ "archive", "read", "write", "compression" ]
2929

thorin/src/package.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,10 @@ where
237237
let section = index
238238
.sections(row_id)
239239
.map_err(|e| Error::RowNotInIndex(e, row_id))?
240-
.find(|index_section| index_section.section == target_section_id)
240+
.find(|index_section| {
241+
// SectionId is a superset of IndexSectionId
242+
Some(index_section.section.dwo_name()) == target_section_id.dwo_name()
243+
})
241244
.ok_or(Error::SectionNotInRow)?;
242245
let adjusted_offset: u64 = contribution.offset.0 + *adjustment;
243246
*adjustment += section.size as u64;

0 commit comments

Comments
 (0)