Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gimli deps #30

Merged
merged 2 commits into from
Jun 12, 2024
Merged

Update gimli deps #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
955af2d
Update gimli deps
workingjubilee May 28, 2024
927fd8e
Curry create_contribution_adjustor at use
workingjubilee May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 20 additions & 29 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion thorin-bin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]

Expand Down
4 changes: 2 additions & 2 deletions thorin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]

Expand Down
52 changes: 11 additions & 41 deletions thorin/src/package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -541,46 +541,16 @@ impl<'file> InProgressDwarfPackage<'file> {

// Create offset adjustor functions, see comment on `create_contribution_adjustor` for
// explanation.
let mut abbrev_adjustor = create_contribution_adjustor(
cu_index.as_ref(),
tu_index.as_ref(),
gimli::SectionId::DebugAbbrev,
);
let mut line_adjustor = create_contribution_adjustor(
cu_index.as_ref(),
tu_index.as_ref(),
gimli::SectionId::DebugLine,
);
let mut loc_adjustor = create_contribution_adjustor(
cu_index.as_ref(),
tu_index.as_ref(),
gimli::SectionId::DebugLoc,
);
let mut loclists_adjustor = create_contribution_adjustor(
cu_index.as_ref(),
tu_index.as_ref(),
gimli::SectionId::DebugLocLists,
);
let mut rnglists_adjustor = create_contribution_adjustor(
cu_index.as_ref(),
tu_index.as_ref(),
gimli::SectionId::DebugRngLists,
);
let mut str_offsets_adjustor = create_contribution_adjustor(
cu_index.as_ref(),
tu_index.as_ref(),
gimli::SectionId::DebugStrOffsets,
);
let mut macinfo_adjustor = create_contribution_adjustor(
cu_index.as_ref(),
tu_index.as_ref(),
gimli::SectionId::DebugMacinfo,
);
let mut macro_adjustor = create_contribution_adjustor(
cu_index.as_ref(),
tu_index.as_ref(),
gimli::SectionId::DebugMacro,
);
let adjustor_for_index =
|id| create_contribution_adjustor(cu_index.as_ref(), tu_index.as_ref(), id);
let mut abbrev_adjustor = adjustor_for_index(gimli::IndexSectionId::DebugAbbrev);
let mut line_adjustor = adjustor_for_index(gimli::IndexSectionId::DebugLine);
let mut loc_adjustor = adjustor_for_index(gimli::IndexSectionId::DebugLoc);
let mut loclists_adjustor = adjustor_for_index(gimli::IndexSectionId::DebugLocLists);
let mut rnglists_adjustor = adjustor_for_index(gimli::IndexSectionId::DebugRngLists);
let mut str_offsets_adjustor = adjustor_for_index(gimli::IndexSectionId::DebugStrOffsets);
let mut macinfo_adjustor = adjustor_for_index(gimli::IndexSectionId::DebugMacinfo);
let mut macro_adjustor = adjustor_for_index(gimli::IndexSectionId::DebugMacro);
davidtwco marked this conversation as resolved.
Show resolved Hide resolved

let mut seen_debug_info = false;
let mut seen_debug_types = false;
Expand Down
Loading