Skip to content

rustc_codegen_ssa: Refactor ArchiveEntry to include entry kind - #157263

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
petrochenkov:arentry
Jun 3, 2026
Merged

rustc_codegen_ssa: Refactor ArchiveEntry to include entry kind#157263
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
petrochenkov:arentry

Conversation

@petrochenkov

Copy link
Copy Markdown
Contributor

Needed for #155338 in particular.

r? @bjorn3

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 1, 2026
Comment threadcompiler/rustc_codegen_ssa/src/back/archive.rs Outdated
}

// Skip objects for bundled libs.
if bundled_libs.contains(&Symbol::intern(fname)) {

@petrochenkovpetrochenkovJun 1, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From this function we can see that it would be also useful to track at least ArchiveEntryKind::Rmeta and ArchiveEntryKind::BundledNativeLib.

But in general, it would probably make sense to get rid of ArchiveEntryKind::Other and keep the full "entry name -> entry kind" table in the link-metadata.

View changes since the review

@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Comment threadcompiler/rustc_codegen_ssa/src/back/archive.rs
Comment threadcompiler/rustc_codegen_ssa/src/back/archive.rs
@bjorn3

Copy link
Copy Markdown
Member

@bors r+

@rust-bors

rust-borsBot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

📌 Commit d39ecc0 has been approved by bjorn3

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 5. This pull request will be tested once the tree is reopened.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jun 3, 2026
rustc_codegen_ssa: Refactor `ArchiveEntry` to include entry kind
Needed for rust-lang#155338 in particular.
r? @bjorn3
This was referenced Jun 3, 2026
rust-borsBot pushed a commit that referenced this pull request Jun 3, 2026
…uwer
Rollup of 15 pull requests
Successful merges:
- #155763 (Promotes 5 Thumb-mode bare-metal Arm targets to Tier 2)
- #156953 (delegation: emit error when there is an infer lifetime in user-specified args)
- #157248 (delegation: move statements out of the first arg)
- #157263 (rustc_codegen_ssa: Refactor `ArchiveEntry` to include entry kind)
- #157311 (Use weak linkage for EII defaults)
- #156089 (Fix unused_parens for pinned reference patterns)
- #156928 (Remove -Zemscripten-wasm-eh)
- #157236 (Reorganize `tests/ui/issues` [3/N])
- #157287 (Const generics: remove AliasTerm::kind(), and small fixes)
- #157294 (Split coroutine layout computation to its own file)
- #157328 (windows: Elide division-by-zero checks in Instant::now())
- #157331 (Rewrite target checking for `#[link]`)
- #157336 (Enable `clippy::mem_replace_with_default`)
- #157362 (Fix trivial wf module argument/doc comment name mismatches)
- #157364 (Rewrite target checking of `rustc_dummy`)
Failed merges:
- #157332 (Rewrite target checking for `#[sanitize]`)
@rust-bors
rust-borsBot merged commit 25b195f into rust-lang:mainJun 3, 2026
12 checks passed
@rustbotrustbot added this to the 1.98.0 milestone Jun 3, 2026
rust-timer added a commit that referenced this pull request Jun 3, 2026
Rollup merge of #157263 - petrochenkov:arentry, r=bjorn3
rustc_codegen_ssa: Refactor `ArchiveEntry` to include entry kind
Needed for #155338 in particular.
r? @bjorn3
@petrochenkov
petrochenkov deleted the arentry branch June 17, 2026 14:54
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request Aug 17, 2026
…uwer
Rollup of 15 pull requests
Successful merges:
- rust-lang/rust#155763 (Promotes 5 Thumb-mode bare-metal Arm targets to Tier 2)
- rust-lang/rust#156953 (delegation: emit error when there is an infer lifetime in user-specified args)
- rust-lang/rust#157248 (delegation: move statements out of the first arg)
- rust-lang/rust#157263 (rustc_codegen_ssa: Refactor `ArchiveEntry` to include entry kind)
- rust-lang/rust#157311 (Use weak linkage for EII defaults)
- rust-lang/rust#156089 (Fix unused_parens for pinned reference patterns)
- rust-lang/rust#156928 (Remove -Zemscripten-wasm-eh)
- rust-lang/rust#157236 (Reorganize `tests/ui/issues` [3/N])
- rust-lang/rust#157287 (Const generics: remove AliasTerm::kind(), and small fixes)
- rust-lang/rust#157294 (Split coroutine layout computation to its own file)
- rust-lang/rust#157328 (windows: Elide division-by-zero checks in Instant::now())
- rust-lang/rust#157331 (Rewrite target checking for `#[link]`)
- rust-lang/rust#157336 (Enable `clippy::mem_replace_with_default`)
- rust-lang/rust#157362 (Fix trivial wf module argument/doc comment name mismatches)
- rust-lang/rust#157364 (Rewrite target checking of `rustc_dummy`)
Failed merges:
- rust-lang/rust#157332 (Rewrite target checking for `#[sanitize]`)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@petrochenkov@rustbot@bjorn3