Update gimli deps

Requires a minor code tweak to account for a breaking change.
rust-lang · Jun 12, 2024 · 3a4f847 · 3a4f847
1 parent bb54997
commit 3a4f847
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 41 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
@@ -214,7 +214,7 @@ where
 pub(crate) fn create_contribution_adjustor<'input, R: 'input>(
     cu_index: Option<&'input UnitIndex<R>>,
     tu_index: Option<&'input UnitIndex<R>>,
-    target_section_id: gimli::SectionId,
+    target_section_id: gimli::IndexSectionId,
 ) -> impl FnMut(DwarfObject, Option<Contribution>) -> Result<Option<Contribution>> + 'input
 where
     R: gimli::Reader,
@@ -544,42 +544,42 @@ impl<'file> InProgressDwarfPackage<'file> {
         let mut abbrev_adjustor = create_contribution_adjustor(
             cu_index.as_ref(),
             tu_index.as_ref(),
-            gimli::SectionId::DebugAbbrev,
+            gimli::IndexSectionId::DebugAbbrev,
         );
         let mut line_adjustor = create_contribution_adjustor(
             cu_index.as_ref(),
             tu_index.as_ref(),
-            gimli::SectionId::DebugLine,
+            gimli::IndexSectionId::DebugLine,
         );
         let mut loc_adjustor = create_contribution_adjustor(
             cu_index.as_ref(),
             tu_index.as_ref(),
-            gimli::SectionId::DebugLoc,
+            gimli::IndexSectionId::DebugLoc,
         );
         let mut loclists_adjustor = create_contribution_adjustor(
             cu_index.as_ref(),
             tu_index.as_ref(),
-            gimli::SectionId::DebugLocLists,
+            gimli::IndexSectionId::DebugLocLists,
         );
         let mut rnglists_adjustor = create_contribution_adjustor(
             cu_index.as_ref(),
             tu_index.as_ref(),
-            gimli::SectionId::DebugRngLists,
+            gimli::IndexSectionId::DebugRngLists,
         );
         let mut str_offsets_adjustor = create_contribution_adjustor(
             cu_index.as_ref(),
             tu_index.as_ref(),
-            gimli::SectionId::DebugStrOffsets,
+            gimli::IndexSectionId::DebugStrOffsets,
         );
         let mut macinfo_adjustor = create_contribution_adjustor(
             cu_index.as_ref(),
             tu_index.as_ref(),
-            gimli::SectionId::DebugMacinfo,
+            gimli::IndexSectionId::DebugMacinfo,
         );
         let mut macro_adjustor = create_contribution_adjustor(
             cu_index.as_ref(),
             tu_index.as_ref(),
-            gimli::SectionId::DebugMacro,
+            gimli::IndexSectionId::DebugMacro,
         );
 
         let mut seen_debug_info = false;