Rollup of 12 pull requests by JonathanBrouwer · Pull Request #152006 · rust-lang/rust

JonathanBrouwer · 2026-02-02T17:52:18Z

Successful merges:

resolve: Report more visibility-related early resolution ambiguities for imports #149596 (resolve: Report more visibility-related early resolution ambiguities for imports)
compiletest: Support --extern modifiers with proc-macro directive #151695 (compiletest: Support --extern modifiers with proc-macro directive)
Use #![feature(adt_const_params)] for static query flags #151938 (Use #![feature(adt_const_params)] for static query flags)
Use default field values in a few more cases #151172 (Use default field values in a few more cases)
more float constants #151825 (more float constants)
regression test for alias-relate changes in lub #151870 (regression test for alias-relate changes in lub)
Add inline syntax for diagnostic messages #151872 (Add inline syntax for diagnostic messages)
explain why we dont skip some of this work when there are field projections #151902 (explain why we dont skip some of this work when there are field projections)
Skip overlapping spans in argument error suggestions #151909 (Skip overlapping spans in argument error suggestions)
Query cleanups #151978 (Query cleanups)
Fix uninitialized UEFI globals in tests #151979 (Fix uninitialized UEFI globals in tests)
Port #[rustc_hidden_type_of_opaque] to attribute parser #151992 (Port #[rustc_hidden_type_of_opaque] to attribute parser)

Makes the use expressions significantly shorter.

So that `pub-priv1.rs` test does not have to (ab)use the `aux-crate` directive for this purpose. This is very edge-casey so I don't think we should document this in rustc-dev-guide. If someone needs to do this they will look at the code and easily find the functionality. This is a bit hacky since `--extern priv:pm.rs` is not valid, but we can make our directives work however we want. And I think this is a fine pragmatic approach. Doing it "the right way" would be a lot of work for not much gain. Plus, that work can be done incrementally in small steps in the future if wanted.

It doesn't use `self`, which means it doesn't need to be part of the `QueryContext` trait; we can just call `extract` directly where necessary.

Various `QueryStackFrame` variables are called `query`; `frame` is a better name. And various `QueryInfo` variables are called `frame`; `info` is a better name. This eliminates some confusing `query.query()` occurrences, which is a good sign, and some `frame.query` occurrences become `info.frame`.

Putting `+ 'tcx` on the `QueryDispatcher` trait lets a few other places be simplified.

It's defined and used in `rustc_query_impl`; `rustc_query_system` doesn't need it. So it can just be an inherent method on `QueryCtxt`.

Export globals via a `doc(hidden)` module. In test code, use the globals from `realstd` so that they are properly initialized.

…ctions

The new ambiguities are reported when the import's visibility is ambiguous and may depend on the resolution/expansion order.

Co-authored-by: lcnr <rust@lcnr.de>

resolve: Report more visibility-related early resolution ambiguities for imports The new ambiguities are reported when the import's visibility is ambiguous and may depend on the resolution/expansion order. Detailed description: rust-lang#149596 (comment).

@Zalathar

…thar compiletest: Support `--extern` modifiers with `proc-macro` directive So that the `src/tools/compiletest/src/directives/auxiliary/tests.rs` test does not have to (ab)use the `aux-crate` directive for this purpose. This is very edge-casey so I don't think we should document this in rustc-dev-guide. Mentioning it will confuse more than it helps. If someone needs to do this they will look at the code and easily find the functionality. This is a bit hacky since `--extern priv:pm.rs` is not valid, but we can make our directives work however we want. And I think this is a fine pragmatic approach. Doing it "the right way" would be a lot of work for not much gain. Plus, that work can be done incrementally in small steps in the future if wanted. r? @Zalathar --- Follow-up to: - rust-lang#151353 - rust-lang#151670 ### Unblocks: - rust-lang#151691, because without this fix that test fails (see rust-lang#151691 (comment))

…rcote Use `#![feature(adt_const_params)]` for static query flags As suggested by rust-lang#151633 (comment), this replaces multiple clunky const booleans with a single const struct, which is a bit nicer. This should also make it easier to experiment with statically resolving other flags, like `eval_always`. There are currently no other compiler crates using `feature(adt_const_params)`, so hopefully it's mature enough for a simple use-case like this one.

…ianne Use default field values in a few more cases Makes the use expressions significantly shorter.

@tgross35

… r=tgross35 more float constants Add constants discussed in rust-lang#146939 rust-lang/libs-team#661 Retry of rust-lang#146934 r? @tgross35

@lcnr

…-relate, r=lcnr regression test for alias-relate changes in lub r? @lcnr

@Kivooeo

Add inline syntax for diagnostic messages This PR adds the new inline diagnostics syntax needed for rust-lang#151366. The syntax itself is briefly described in the MCP: rust-lang/compiler-team#959 To test these changes: * I added quite a few uitests * I converted the first crate `rustc_attr_parsing` to the new syntax in a separate PR: rust-lang#151944 r? @Kivooeo

explain why we dont skip some of this work when there are field projections Perf says it doesn't help 🤷

…int-spans, r=Kivooeo Skip overlapping spans in argument error suggestions Fixes rust-lang#151607

@Zalathar

…thar Query cleanups A few small cleanups in the query system. r? @Zalathar

@Ayush1325

…r=jhpratt Fix uninitialized UEFI globals in tests Export globals via a `doc(hidden)` module. In test code, use the globals from `realstd` so that they are properly initialized. CC @Ayush1325

Zalathar · 2026-02-03T01:31:41Z

GitHub says the incident is resolved; let's try again.

@bors retry p=1001

Zalathar · 2026-02-03T01:32:10Z

@bors p=1001

rust-bors · 2026-02-03T04:40:36Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 8m 7s
Pushing 5ac8ece to main...

github-actions · 2026-02-03T04:43:54Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing f60a0f1 (parent) -> 5ac8ece (this PR)

Test differences

Show 1428 test diffs

Stage 0

directives::auxiliary::tests::test_proc_macro_value_no_modifiers: [missing] -> pass (J3)
directives::auxiliary::tests::test_proc_macro_value_with_modifiers: [missing] -> pass (J3)

Stage 1

[ui] tests/ui-fulldeps/session-diagnostic/diagnostic-derive-inline.rs: [missing] -> ignore (ignored when the bootstrapping stage is stage1) (J2)
[ui] tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive-inline.rs: [missing] -> ignore (ignored when the bootstrapping stage is stage1) (J2)
[ui] tests/ui/argument-suggestions/disjoint-spans-issue-151607.rs: [missing] -> pass (J2)
[ui] tests/ui/imports/ambiguous-import-visibility-macro.rs: [missing] -> pass (J2)
[ui] tests/ui/imports/ambiguous-import-visibility-module.rs: [missing] -> pass (J2)
[ui] tests/ui/imports/ambiguous-import-visibility.rs: [missing] -> pass (J2)
[ui] tests/ui/traits/next-solver/generalize/relate-alias-in-lub.rs#next: [missing] -> pass (J2)
[ui] tests/ui/traits/next-solver/generalize/relate-alias-in-lub.rs#old: [missing] -> pass (J2)

Stage 2

[ui] tests/ui-fulldeps/session-diagnostic/diagnostic-derive-inline.rs: [missing] -> ignore (ignored when the release channel is stable) (J0)
[ui] tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive-inline.rs: [missing] -> ignore (ignored when the release channel is stable) (J0)
[ui] tests/ui/argument-suggestions/disjoint-spans-issue-151607.rs: [missing] -> pass (J1)
[ui] tests/ui/imports/ambiguous-import-visibility-macro.rs: [missing] -> pass (J1)
[ui] tests/ui/imports/ambiguous-import-visibility-module.rs: [missing] -> pass (J1)
[ui] tests/ui/imports/ambiguous-import-visibility.rs: [missing] -> pass (J1)
[ui] tests/ui/traits/next-solver/generalize/relate-alias-in-lub.rs#next: [missing] -> pass (J1)
[ui] tests/ui/traits/next-solver/generalize/relate-alias-in-lub.rs#old: [missing] -> pass (J1)
[ui] tests/ui-fulldeps/session-diagnostic/diagnostic-derive-inline.rs: [missing] -> pass (J4)
[ui] tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive-inline.rs: [missing] -> pass (J4)

Additionally, 1408 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 5ac8ecea36e7548534e0bc3d4aa1c12bd4908566 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

dist-x86_64-apple: 6335.5s -> 7316.1s (+15.5%)
dist-ohos-x86_64: 4974.1s -> 4261.0s (-14.3%)
aarch64-apple: 9647.4s -> 10901.4s (+13.0%)
x86_64-gnu-llvm-20: 4636.5s -> 4147.1s (-10.6%)
x86_64-gnu-llvm-21-3: 6972.4s -> 6322.6s (-9.3%)
x86_64-gnu-miri: 4582.0s -> 4975.2s (+8.6%)
x86_64-mingw-1: 9359.9s -> 10135.2s (+8.3%)
armhf-gnu: 5404.5s -> 4963.7s (-8.2%)
dist-x86_64-msvc: 7262.2s -> 6693.4s (-7.8%)
x86_64-gnu-distcheck: 8330.4s -> 7679.5s (-7.8%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

jhpratt · 2026-02-03T04:43:56Z

Seems to be working as expected now.

@bors treeopen

rust-timer · 2026-02-03T04:43:57Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#149596	resolve: Report more visibility-related early resolution am…	`fc75a6d927d1ea2bfbc02a6fe00d98e5b40a5e4b` (link)
#151172	Use default field values in a few more cases	`c1f389b3b136fc61f87d6a6998d3bd4ccfebd2d7` (link)
#151695	compiletest: Support `--extern` modifiers with `proc-macro`…	`53dfb5e8dc2e25625b468c060e8a41a83b129630` (link)
#151825	more float constants	`2a7b7e6828ce2e2854716035da819620426871e2` (link)
#151870	regression test for alias-relate changes in lub	`8880217fdebbd88a4979f5d672721819fc3b0a86` (link)
#151872	Add inline syntax for diagnostic messages	`263b6ab7b24ecd5c9ef6b5e589daf6dbae06049b` (link)
#151902	explain why we dont skip some of this work when there are f…	`80fc3d8919af6bf17593bf483e9f09a9b84c2f9a` (link)
#151909	Skip overlapping spans in argument error suggestions	`4394655245256eb3b0090a50f4462cd2ded481af` (link)
#151938	Use `#![feature(adt_const_params)]` for static query flags	`70f96b547dcd48b025ad99408dc57883b9784508` (link)
#151978	Query cleanups	`174ad5533a505830f47e3aaec57a2e4b13f09b70` (link)
#151979	Fix uninitialized UEFI globals in tests	`0bef0f35351a5ed855ed4d4a829d8d8c6b33236e` (link)
#151992	Port `#[rustc_hidden_type_of_opaque]` to attribute parser	`38df8605bbf72d91bc4eba9b4d03961e2fba7a2a` (link)

previous master: f60a0f1bcc

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-bors · 2026-02-03T04:43:59Z

Tree is now open for merging.

rust-timer · 2026-02-03T05:21:58Z

Finished benchmarking commit (5ac8ece): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -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)	1.7%	[1.7%, 1.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 2.2%, secondary -2.3%)

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

	mean	range	count
Regressions ❌ (primary)	5.4%	[5.4%, 5.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.9%	[-0.9%, -0.9%]	1
Improvements ✅ (secondary)	-2.3%	[-2.3%, -2.3%]	1
All ❌✅ (primary)	2.2%	[-0.9%, 5.4%]	2

Cycles

Results (primary 3.4%, secondary 1.5%)

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

	mean	range	count
Regressions ❌ (primary)	3.4%	[3.4%, 3.4%]	1
Regressions ❌ (secondary)	3.7%	[2.4%, 4.6%]	8
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.2%	[-5.6%, -2.9%]	3
All ❌✅ (primary)	3.4%	[3.4%, 3.4%]	1

Binary size

Results (primary -0.0%, secondary -0.1%)

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)	-	-	0
Improvements ✅ (primary)	-0.0%	[-0.1%, -0.0%]	21
Improvements ✅ (secondary)	-0.1%	[-0.2%, -0.0%]	27
All ❌✅ (primary)	-0.0%	[-0.1%, -0.0%]	21

Bootstrap: 470.454s -> 474.688s (0.90%)
Artifact size: 397.65 MiB -> 397.75 MiB (0.03%)

Kobzol · 2026-02-03T07:26:24Z

@rust-timer build fc75a6d

(just testing perfbot)

rust-timer · 2026-02-03T08:08:29Z

Finished benchmarking commit (fc75a6d): comparison URL.

Overall result: no relevant changes - no action needed

Instruction count

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

Max RSS (memory usage)

Results (primary 2.4%, secondary -3.3%)

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

	mean	range	count
Regressions ❌ (primary)	4.0%	[2.7%, 5.3%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-3.3%	[-3.3%, -3.3%]	1
All ❌✅ (primary)	2.4%	[-0.7%, 5.3%]	3

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.2%, 3.8%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

Results (primary 0.0%, secondary 0.1%)

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

	mean	range	count
Regressions ❌ (primary)	0.0%	[0.0%, 0.0%]	10
Regressions ❌ (secondary)	0.1%	[0.0%, 0.1%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[0.0%, 0.0%]	10

Bootstrap: 470.454s -> 475.329s (1.04%)
Artifact size: 397.65 MiB -> 397.69 MiB (0.01%)

estebank and others added 30 commits January 15, 2026 20:39

Use default field values in a few more cases

b4781c8

Makes the use expressions significantly shorter.

regression test for alias-relate changes in lub

0271b6b

Skip overlapping spans in argument error suggestions

8c0d93b

Add inline syntax for diagnostic messages

8927aa5

Uitests for #[diagnostic]

378c6fc

Uitests for subdiagnostics

523d9d9

Add verification for inline fluent messages

ca2be71

more float constants: sqrt(5), 1/sqrt(5)

caaee92

Remove lift_query_info.

cd1c773

It doesn't use `self`, which means it doesn't need to be part of the `QueryContext` trait; we can just call `extract` directly where necessary.

Eliminate some 'a lifetimes.

8e2c9c6

Putting `+ 'tcx` on the `QueryDispatcher` trait lets a few other places be simplified.

Move depth_limit_error out of QueryContext trait.

c6afd45

It's defined and used in `rustc_query_impl`; `rustc_query_system` doesn't need it. So it can just be an inherent method on `QueryCtxt`.

Fix uninitialized UEFI globals in tests

59868c1

Export globals via a `doc(hidden)` module. In test code, use the globals from `realstd` so that they are properly initialized.

Use #![feature(adt_const_params)] for static query flags

09de0fd

explain why we dont skip some of this work when there are field proje…

c725637

…ctions

resolve: Report more early resolution ambiguities for imports

c0393cf

The new ambiguities are reported when the import's visibility is ambiguous and may depend on the resolution/expansion order.

Update tests/ui/traits/next-solver/generalize/relate-alias-in-lub.rs

629ff9b

Co-authored-by: lcnr <rust@lcnr.de>

Port

82a530c

Rollup merge of rust-lang#151172 - estebank:default-field-values, r=d…

5144366

…ianne Use default field values in a few more cases Makes the use expressions significantly shorter.

Rollup merge of rust-lang#151825 - joshuarayton:more-float-constants,…

f0355cc

… r=tgross35 more float constants Add constants discussed in rust-lang#146939 rust-lang/libs-team#661 Retry of rust-lang#146934 r? @tgross35

Rollup merge of rust-lang#151870 - jdonszelmann:regression-test-alias…

894d05d

…-relate, r=lcnr regression test for alias-relate changes in lub r? @lcnr

Rollup merge of rust-lang#151902 - RalfJung:place-ty-opt, r=Kobzol

382c889

explain why we dont skip some of this work when there are field projections Perf says it doesn't help 🤷

Rollup merge of rust-lang#151909 - chenyukang:yukang-fix-151607-disjo…

a34cb94

…int-spans, r=Kivooeo Skip overlapping spans in argument error suggestions Fixes rust-lang#151607

Rollup merge of rust-lang#151978 - nnethercote:query-cleanups, r=Zala…

9625c1e

…thar Query cleanups A few small cleanups in the query system. r? @Zalathar

Rollup merge of rust-lang#151979 - nicholasbishop:push-ssmqyutnpypo, …

22b2913

…r=jhpratt Fix uninitialized UEFI globals in tests Export globals via a `doc(hidden)` module. In test code, use the globals from `realstd` so that they are properly initialized. CC @Ayush1325

This was referenced Feb 2, 2026

rustc-dev-guide subtree update #152022

Merged

Move the fingerprint_style special case into DepKindVTable creation #151936

Merged

rust-bors bot 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 Feb 3, 2026

This comment has been minimized.

Sign in to view

This was referenced Feb 3, 2026

stabilize ptr_as_ref_unchecked #151995

Merged

Move bigint helper tracking issues #152018

Merged

Fix missing unused_variables lint when using a match guard #151990

Merged

Rollup of 11 pull requests #152025

Merged

rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 3, 2026

rust-bors bot merged commit 5ac8ece into rust-lang:main Feb 3, 2026
12 checks passed

rustbot added this to the 1.95.0 milestone Feb 3, 2026

This comment has been minimized.

Sign in to view

Uh oh!

Conversation

JonathanBrouwer commented Feb 2, 2026

Uh oh!

Zalathar commented Feb 3, 2026

Uh oh!

Zalathar commented Feb 3, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Feb 3, 2026

Uh oh!

Uh oh!

github-actions bot commented Feb 3, 2026

Test differences

Stage 0

Stage 1

Stage 2

Job duration changes

Uh oh!

jhpratt commented Feb 3, 2026

Uh oh!

rust-timer commented Feb 3, 2026

Uh oh!

rust-bors bot commented Feb 3, 2026

Uh oh!

rust-timer commented Feb 3, 2026

Overall result: ❌ regressions - no action needed

Uh oh!

Kobzol commented Feb 3, 2026

Uh oh!

This comment has been minimized.

rust-timer commented Feb 3, 2026

Overall result: no relevant changes - no action needed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants