Metadata loader cleanups #150014

bjorn3 · 2025-12-15T09:54:23Z

Couple of cleanups I found while working on #149273

This renames some fields and enum variants to clarify what they are used for, moves a check to another method and slightly simplifies the way profiler_builtins is linked.

It is unconditionally included.

Perhaps the old name used to be accurate in the past, but nowadays most injected dependencies are unconditionally linked too.

It is always identical to the list of values in cnum_map.

rustbot · 2025-12-15T09:54:28Z

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

jieyouxu

Thanks, +1 on the rename

View changes since this review

jieyouxu · 2025-12-15T12:14:54Z

compiler/rustc_metadata/src/creader.rs

                        tcx,
                        sym::core,
-                        CrateDepKind::Explicit,
+                        CrateDepKind::Unconditional,


Remark: okay I was about to ask what's the distinction between Explicit/Implicit, but this commit answers my question 😆

jieyouxu · 2025-12-15T12:17:28Z

@bors r+ rollup

bors · 2025-12-15T12:17:31Z

📌 Commit 0e1e72a has been approved by jieyouxu

It is now in the queue for this repository.

…=jieyouxu Metadata loader cleanups Couple of cleanups I found while working on rust-lang#149273 This renames some fields and enum variants to clarify what they are used for, moves a check to another method and slightly simplifies the way profiler_builtins is linked.

Rollup of 9 pull requests Successful merges: - #148756 (Warn on codegen attributes on required trait methods) - #148790 (Add new Tier-3 target: riscv64im-unknown-none-elf) - #149271 (feat: dlopen Enzyme) - #149354 (Bootstrap config: libgccjit libs dir) - #149459 (std: sys: fs: uefi: Implement set_times and set_perm) - #149950 (Simplify how inline asm handles `MaybeUninit`) - #150000 (Port `#[rustc_legacy_const_generics]` to use attribute parser ) - #150014 (Metadata loader cleanups) - #150021 (document that mpmc channels deliver an item to (at most) one receiver) r? `@ghost` `@rustbot` modify labels: rollup

…=jieyouxu Metadata loader cleanups Couple of cleanups I found while working on rust-lang#149273 This renames some fields and enum variants to clarify what they are used for, moves a check to another method and slightly simplifies the way profiler_builtins is linked.

Rollup of 8 pull requests Successful merges: - #148756 (Warn on codegen attributes on required trait methods) - #148790 (Add new Tier-3 target: riscv64im-unknown-none-elf) - #149271 (feat: dlopen Enzyme) - #149459 (std: sys: fs: uefi: Implement set_times and set_perm) - #149950 (Simplify how inline asm handles `MaybeUninit`) - #150000 (Port `#[rustc_legacy_const_generics]` to use attribute parser ) - #150014 (Metadata loader cleanups) - #150021 (document that mpmc channels deliver an item to (at most) one receiver) r? `@ghost` `@rustbot` modify labels: rollup

…=jieyouxu Metadata loader cleanups Couple of cleanups I found while working on rust-lang#149273 This renames some fields and enum variants to clarify what they are used for, moves a check to another method and slightly simplifies the way profiler_builtins is linked.

Rollup of 14 pull requests Successful merges: - #148756 (Warn on codegen attributes on required trait methods) - #148790 (Add new Tier-3 target: riscv64im-unknown-none-elf) - #149271 (feat: dlopen Enzyme) - #149459 (std: sys: fs: uefi: Implement set_times and set_perm) - #149771 (bootstrap readme: make easy to read when editor wrapping is not enabled) - #149856 (Provide an extended framework for type visit, for use in rust-analyzer) - #149950 (Simplify how inline asm handles `MaybeUninit`) - #150014 (Metadata loader cleanups) - #150021 (document that mpmc channels deliver an item to (at most) one receiver) - #150022 (Generate macro expansion for rust compiler crates docs) - #150029 (Update books) - #150031 (assert impossible branch is impossible) - #150034 (do not add `I-prioritize` when `F-*` labels are present) - #150036 (Use the embeddable filename for coverage artifacts) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 13 pull requests Successful merges: - #148756 (Warn on codegen attributes on required trait methods) - #148790 (Add new Tier-3 target: riscv64im-unknown-none-elf) - #149271 (feat: dlopen Enzyme) - #149459 (std: sys: fs: uefi: Implement set_times and set_perm) - #149771 (bootstrap readme: make easy to read when editor wrapping is not enabled) - #149856 (Provide an extended framework for type visit, for use in rust-analyzer) - #149950 (Simplify how inline asm handles `MaybeUninit`) - #150014 (Metadata loader cleanups) - #150021 (document that mpmc channels deliver an item to (at most) one receiver) - #150029 (Update books) - #150031 (assert impossible branch is impossible) - #150034 (do not add `I-prioritize` when `F-*` labels are present) - #150036 (Use the embeddable filename for coverage artifacts) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #150014 - bjorn3:metadata_loader_cleanups, r=jieyouxu Metadata loader cleanups Couple of cleanups I found while working on #149273 This renames some fields and enum variants to clarify what they are used for, moves a check to another method and slightly simplifies the way profiler_builtins is linked.

bjorn3 · 2025-12-16T10:46:41Z

There is a minor regression overall regression in the rollup. Lets check if this is the cause:

@rust-timer build 434f473

bjorn3 · 2025-12-16T12:27:05Z

I was too quick. CI for the unrolled commit hadn't finished yet.

@rust-timer build 434f473

rust-timer · 2025-12-16T13:08:49Z

Finished benchmarking commit (434f473): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.3%, -0.2%]	4
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary -1.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.2%	[3.2%, 3.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.2%	[-3.9%, -2.8%]	4
All ❌✅ (primary)	-	-	0

Cycles

Results (secondary 2.8%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.8%	[2.7%, 2.9%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 479.175s -> 479.501s (0.07%)
Artifact size: 390.21 MiB -> 390.22 MiB (0.00%)

bjorn3 · 2025-12-16T13:11:58Z

Looks like this was indeed the cause. It is going to be either aff1f2a or a0f8dff. I don't see how the others could regress performance. 0e1e72a is the only other commit that is not purely a rename, but that one should only be able to improve performance.

bjorn3 added 5 commits December 15, 2025 09:30

Rename dep_root field of CrateOrigin to dep_root_for_errors

7d57c6f

Use CrateDepKind::Explicit for the profiler runtime

a0f8dff

It is unconditionally included.

Rename variants of CrateDepKind to be more descriptive

c7a99e2

Perhaps the old name used to be accurate in the past, but nowadays most injected dependencies are unconditionally linked too.

Handle CrateOrigin::Injected in CrateOrigin::private_dep

aff1f2a

Remove dependencies field of CrateMetadata

0e1e72a

It is always identical to the list of values in cnum_map.

rustbot assigned jieyouxu Dec 15, 2025

rustbot 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 Dec 15, 2025

jieyouxu approved these changes Dec 15, 2025

View reviewed changes

bors 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 Dec 15, 2025

matthiaskrgr mentioned this pull request Dec 15, 2025

Rollup of 9 pull requests #150028

Closed

matthiaskrgr mentioned this pull request Dec 15, 2025

Rollup of 8 pull requests #150030

Closed

Zalathar mentioned this pull request Dec 16, 2025

Rollup of 14 pull requests #150039

Closed

Zalathar mentioned this pull request Dec 16, 2025

Rollup of 13 pull requests #150041

Merged

bors merged commit 0d0f136 into rust-lang:main Dec 16, 2025
11 checks passed

rustbot added this to the 1.94.0 milestone Dec 16, 2025

bjorn3 deleted the metadata_loader_cleanups branch December 16, 2025 10:46

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

This comment has been minimized.

Sign in to view

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Metadata loader cleanups #150014

Metadata loader cleanups #150014

bjorn3 commented Dec 15, 2025

Uh oh!

rustbot commented Dec 15, 2025

Uh oh!

jieyouxu left a comment •

edited by rustbot

Loading

Uh oh!

jieyouxu Dec 15, 2025

Uh oh!

jieyouxu commented Dec 15, 2025

Uh oh!

bors commented Dec 15, 2025

Uh oh!

Uh oh!

bjorn3 commented Dec 16, 2025

Uh oh!

This comment has been minimized.

This comment was marked as resolved.

bjorn3 commented Dec 16, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Dec 16, 2025

Uh oh!

bjorn3 commented Dec 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Metadata loader cleanups #150014

Metadata loader cleanups #150014

Conversation

bjorn3 commented Dec 15, 2025

Uh oh!

rustbot commented Dec 15, 2025

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Dec 15, 2025

Uh oh!

bors commented Dec 15, 2025

Uh oh!

Uh oh!

bjorn3 commented Dec 16, 2025

Uh oh!

This comment has been minimized.

This comment was marked as resolved.

bjorn3 commented Dec 16, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Dec 16, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

bjorn3 commented Dec 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jieyouxu left a comment •

edited by rustbot

Loading