Skip to content

Commit 3a4f847

Browse files
workingjubileedavidtwco
authored andcommitted
Update gimli deps
Requires a minor code tweak to account for a breaking change.
1 parent bb54997 commit 3a4f847

File tree

4 files changed

+32
-41
lines changed

4 files changed

+32
-41
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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ where
214214
pub(crate) fn create_contribution_adjustor<'input, R: 'input>(
215215
cu_index: Option<&'input UnitIndex<R>>,
216216
tu_index: Option<&'input UnitIndex<R>>,
217-
target_section_id: gimli::SectionId,
217+
target_section_id: gimli::IndexSectionId,
218218
) -> impl FnMut(DwarfObject, Option<Contribution>) -> Result<Option<Contribution>> + 'input
219219
where
220220
R: gimli::Reader,
@@ -544,42 +544,42 @@ impl<'file> InProgressDwarfPackage<'file> {
544544
let mut abbrev_adjustor = create_contribution_adjustor(
545545
cu_index.as_ref(),
546546
tu_index.as_ref(),
547-
gimli::SectionId::DebugAbbrev,
547+
gimli::IndexSectionId::DebugAbbrev,
548548
);
549549
let mut line_adjustor = create_contribution_adjustor(
550550
cu_index.as_ref(),
551551
tu_index.as_ref(),
552-
gimli::SectionId::DebugLine,
552+
gimli::IndexSectionId::DebugLine,
553553
);
554554
let mut loc_adjustor = create_contribution_adjustor(
555555
cu_index.as_ref(),
556556
tu_index.as_ref(),
557-
gimli::SectionId::DebugLoc,
557+
gimli::IndexSectionId::DebugLoc,
558558
);
559559
let mut loclists_adjustor = create_contribution_adjustor(
560560
cu_index.as_ref(),
561561
tu_index.as_ref(),
562-
gimli::SectionId::DebugLocLists,
562+
gimli::IndexSectionId::DebugLocLists,
563563
);
564564
let mut rnglists_adjustor = create_contribution_adjustor(
565565
cu_index.as_ref(),
566566
tu_index.as_ref(),
567-
gimli::SectionId::DebugRngLists,
567+
gimli::IndexSectionId::DebugRngLists,
568568
);
569569
let mut str_offsets_adjustor = create_contribution_adjustor(
570570
cu_index.as_ref(),
571571
tu_index.as_ref(),
572-
gimli::SectionId::DebugStrOffsets,
572+
gimli::IndexSectionId::DebugStrOffsets,
573573
);
574574
let mut macinfo_adjustor = create_contribution_adjustor(
575575
cu_index.as_ref(),
576576
tu_index.as_ref(),
577-
gimli::SectionId::DebugMacinfo,
577+
gimli::IndexSectionId::DebugMacinfo,
578578
);
579579
let mut macro_adjustor = create_contribution_adjustor(
580580
cu_index.as_ref(),
581581
tu_index.as_ref(),
582-
gimli::SectionId::DebugMacro,
582+
gimli::IndexSectionId::DebugMacro,
583583
);
584584

585585
let mut seen_debug_info = false;

0 commit comments

Comments
 (0)