Rollup of 7 pull requests by JonathanBrouwer · Pull Request #153124 · rust-lang/rust

JonathanBrouwer · 2026-02-26T08:57:07Z

Successful merges:

Revert "Move aarch64-apple dist builder to dynamic llvm linking" #153079 (Revert "Move aarch64-apple dist builder to dynamic llvm linking")
Avoid duplicate requirement diag args in RegionOriginNote #152651 (Avoid duplicate requirement diag args in RegionOriginNote)
Port #[rustc_autodiff] to the attribute parser infrastructure #152978 (Port #[rustc_autodiff] to the attribute parser infrastructure)
Migration of LintDiagnostic - part 4 #153091 (Migration of LintDiagnostic - part 4)
Query key cleanups #153112 (Query key cleanups)
mailmap: add redddy #153118 (mailmap: add redddy)
Clean up some code related to QueryVTable::execute_query_fn #153120 (Clean up some code related to QueryVTable::execute_query_fn)

…nable autodiff in CI for it" This reverts commit c033de9.

All three of these functions were previously taking `cache` and `execute_query_fn` as separate arguments, but after some other recent simplifications we can just pass `&'tcx QueryVTable<'tcx, C>` instead. This makes it easier to see where `execute_query_fn` is actually called.

This function is tricky to document, and there's more that could be said here, but I don't want to take up too much vertical space, or add too much risk of details becoming inaccurate over time.

It's currently in `dep_node.rs`, along with a blanket impl. Specific impls are in `dep_node_key.rs`. This commit moves the trait and the blanket impl into `dep_node_key.rs`, so everything is in one place.

Because `Key` is extremely generic and hard to search for. Also rename `LocalKey` and `AsLocalKey` similarly, for consistency.

We have two traits governing query keys, for no particular reason. This commit combines them.

Because `Storage` is a vague name that I've never liked.

…_borrowck`

…_lint` methods

Revert "Move aarch64-apple dist builder to dynamic llvm linking" Reverts c033de9 (part of rust-lang#152768) in order to fixrust-lang#153077.

…em-diag-args, r=jdonszelmann Avoid duplicate `requirement` diag args in `RegionOriginNote` Fixesrust-lang#143872 `RegionOriginNote::WithRequirement` can be emitted multiple times for one diagnostic. I fixed the ICE by scoping per note fluent args in `RegionOriginNote::WithRequirement` with `store_args` and `restore_args`.

@jdonszelmann

…jdonszelmann Port `#[rustc_autodiff]` to the attribute parser infrastructure For rust-lang#131229 r? @jdonszelmann cc @ZuseZ4 `autodiff_forward` and `autodiff_reverse` can be ported in a seperate PR, but these are expanded in the AST and don't exist anymore in the HIR so this is a bit more of a challenge.

@JonathanBrouwer

…athanBrouwer Migration of `LintDiagnostic` - part 4 Follow-up of: * rust-lang#152933 * rust-lang#153016 * rust-lang#153051 More `LintDiagnostic` items being migrated to `Diagnostic`. Since there is no remaining `emit_node_span_lint` calls, I replaced the method with the code of `emit_diag_node_span_lint`. r? @JonathanBrouwer

@Zalathar

…thercote Query key cleanups The first three commits are simple. The last two are a bit more opinionated, see what you think. r? @Zalathar

mailmap: add redddy I changed the email address used for git.

Clean up some code related to `QueryVTable::execute_query_fn` This PR is an assortment of small cleanups to code that interacts with `execute_query_fn` in the query vtable. I also experimented with trying to replace the macro-generated `__rust_end_short_backtrace` functions with a single shared generic function, but I couldn't manage to avoid breaking short backtraces, so I left a note behind to document my attempt. r? nnethercote (or compiler)

JonathanBrouwer · 2026-02-26T08:57:27Z

@bors r+ rollup=never p=11

rust-bors · 2026-02-26T08:57:30Z

📌 Commit 3eafea8 has been approved by JonathanBrouwer

It is now in the queue for this repository.

JonathanBrouwer · 2026-02-26T08:57:33Z

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

Rollup of 7 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1

rust-bors · 2026-02-26T12:31:56Z

☀️ Try build successful (CI)
Build commit: d2468fe (d2468fe8709149febdde91c93c4588fdc2688abe, parent: f02672cb8bffef88934d31d9044257a4d11e5d1f)

rust-bors · 2026-02-26T16:38:45Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 4h 17m 52s
Pushing bb779a9 to main...

rust-timer · 2026-02-26T16:40:47Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#152651	Avoid duplicate `requirement` diag args in `RegionOriginNot…	`908b47564e9dd3f741bee8f410fa725ba05b0418` (link)
#152978	Port `#[rustc_autodiff]` to the attribute parser infrastruc…	`1df4d6eede6a656a186ba94b6ebe679a39d8332a` (link)
#153079	Revert "Move aarch64-apple dist builder to dynamic llvm lin…	`d508fcf2a3d443fa58d42a948541e1ce73f810b8` (link)
#153091	Migration of `LintDiagnostic` - part 4	`96299577e362f7937a16572c70ce48c0e349865f` (link)
#153112	Query key cleanups	`f07a639661216be9f06bc3643933dcff321d8146` (link)
#153118	mailmap: add redddy	`28faca081e55770332abbb8cce6167094d0acb76` (link)
#153120	Clean up some code related to `QueryVTable::execute_query_f…	`122a72dcac509c8f7facdcc7944c5e96a342d012` (link)

previous master: 69b78537fa

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

github-actions · 2026-02-26T16:42:04Z

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 69b7853 (parent) -> bb779a9 (this PR)

Test differences

Show 36 test diffs

Stage 1

[ui] tests/ui/traits/compare-impl-item-conflicting-lifetime-requirements.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/ui/traits/compare-impl-item-conflicting-lifetime-requirements.rs: [missing] -> pass (J1)

Additionally, 34 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 bb779a91568ac1ee0b8a9dcb6b69219ef30b18a3 --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

pr-check-1: 26m 56s -> 32m 32s (+20.7%)
i686-gnu-2: 1h 25m -> 1h 42m (+19.7%)
dist-aarch64-apple: 1h 42m -> 1h 59m (+16.2%)
x86_64-gnu-tools: 55m 43s -> 1h 4m (+15.5%)
x86_64-rust-for-linux: 46m 8s -> 52m 54s (+14.7%)
armhf-gnu: 1h 24m -> 1h 35m (+13.5%)
aarch64-gnu-llvm-20-2: 46m 5s -> 51m 46s (+12.3%)
x86_64-gnu-miri: 1h 15m -> 1h 24m (+11.2%)
x86_64-gnu-gcc: 1h 1m -> 1h 8m (+11.1%)
dist-ohos-x86_64: 1h 11m -> 1h 18m (+10.0%)

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.

rust-timer · 2026-02-26T17:24:55Z

Finished benchmarking commit (bb779a9): comparison URL.

Overall result: ✅ improvements - 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)	-	-	0
Improvements ✅ (primary)	-0.2%	[-0.4%, -0.1%]	17
Improvements ✅ (secondary)	-0.4%	[-0.9%, -0.1%]	20
All ❌✅ (primary)	-0.2%	[-0.4%, -0.1%]	17

Max RSS (memory usage)

Results (primary -3.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)	-3.1%	[-3.1%, -3.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.1%	[-3.1%, -3.1%]	1

Cycles

Results (secondary 4.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)	4.1%	[4.1%, 4.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 480.132s -> 480.119s (-0.00%)
Artifact size: 395.80 MiB -> 395.65 MiB (-0.04%)

JonathanBrouwer · 2026-02-26T21:35:50Z

Started 3 perf runs because I'd like to know what caused this happy accident: #153091 #153112 #153120

JonathanBrouwer · 2026-02-27T06:09:28Z

Caused by #153120

reddevilmidzyand others added 28 commits February 18, 2026 20:42

mailmap: add redddy
bc6c103

Add UI test for duplicate requirement diag args in compare-impl-item
fe7dc48

avoid duplicate requirement diag args in RegionOriginNote
3f76a0d

Revert "Move aarch64-apple dist builder to dynamic llvm linking and e…
5b99fcd
…nable autodiff in CI for it" This reverts commit c033de9.

Add some docs for QueryVTable::execute_query_fn
cd7bbac
This function is tricky to document, and there's more that could be said here, but I don't want to take up too much vertical space, or add too much risk of details becoming inaccurate over time.

Rename some query plumbing to match QueryVTable::execute_query_fn
fb42537

Move trait DepNodeKey.
6ba5b1a
It's currently in `dep_node.rs`, along with a blanket impl. Specific impls are in `dep_node_key.rs`. This commit moves the trait and the blanket impl into `dep_node_key.rs`, so everything is in one place.

Rename trait Key as trait QueryKey`
fbea6dd
Because `Key` is extremely generic and hard to search for. Also rename `LocalKey` and `AsLocalKey` similarly, for consistency.

Remove unnecessary Clone bounds.
b284b04

Merge trait QueryCacheKey into trait QueryKey.
4499407
We have two traits governing query keys, for no particular reason. This commit combines them.

Rename Storage as Cache.
9ba101f
Because `Storage` is a vague name that I've never liked.

Remove unused TyCtxt::emit_node_lint method
5edbf6a

Replace TyCtxt::node_span_lint with emit_node_span_lint in `rustc…
4803bb9
…_borrowck`

Add new LintContext::opt_span_diag_lint and `LintContext::emit_diag…
3f71fd0
…_lint` methods

Replace emit_span_lint with emit_span_diag_lint in rustc_lint
bca1cb4

Replace emit_span_lint with emit_span_diag_lint in rustc_lint
b409cb1

Move rustc_ast::AutoDiffAttrs to rustc_hir::RustcAutodiff
90c93ab

Migrate rustc_lint::EqInternalMethodImplemented to Diagnostic
f9b70f0

Port rustc_autodiff to the attribute parsers
5cd5b90

Remove attributes from check_attr that were already parsed
d5b6474

Rollup merge ofrust-lang#153079- RalfJung:revert-macos-dyn, r=jieyouxu
7aa4f04
Revert "Move aarch64-apple dist builder to dynamic llvm linking" Reverts c033de9 (part of rust-lang#152768) in order to fixrust-lang#153077.

Rollup merge ofrust-lang#153112- nnethercote:query-key-stuff, r=nne…
8386f94
…thercote Query key cleanups The first three commits are simple. The last two are a bit more opinionated, see what you think. r? @Zalathar

Rollup merge ofrust-lang#153118- reddevilmidzy:mailmap, r=jieyouxu
272d523
mailmap: add redddy I changed the email address used for git.

rust-borsBot added the rollup A PR which is a rollup label Feb 26, 2026

rustbot added the A-attributes Area: Attributes (`#[…]`, `#![…]`) label Feb 26, 2026

rust-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 Feb 26, 2026

This comment has been minimized.
Sign in to view

JonathanBrouwer mentioned this pull request Feb 26, 2026
Rollup of 5 pull requests #153123
Closed

This comment has been minimized.
Sign in to view

rust-borsBot 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 26, 2026

rust-borsBot merged commit bb779a9 into rust-lang:mainFeb 26, 2026
13 checks passed

rustbot added this to the 1.95.0 milestone Feb 26, 2026

JonathanBrouwer deleted the rollup-3OajkjU branch August 21, 2026 08:04

Navigation Menu

Uh oh!

Uh oh!

Rollup of 7 pull requests - #153124

Rollup of 7 pull requests#153124
rust-bors[bot] merged 28 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-3OajkjU

JonathanBrouwer commented Feb 26, 2026

Uh oh!

JonathanBrouwer commented Feb 26, 2026

Uh oh!

rust-borsBot commented Feb 26, 2026

Uh oh!

JonathanBrouwer commented Feb 26, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-borsBot commented Feb 26, 2026

Uh oh!

rust-borsBot commented Feb 26, 2026

Uh oh!

Uh oh!

rust-timer commented Feb 26, 2026

Uh oh!

github-actionsBot commented Feb 26, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented Feb 26, 2026

Uh oh!

JonathanBrouwer commented Feb 26, 2026

Uh oh!

JonathanBrouwer commented Feb 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

JonathanBrouwer commented Feb 26, 2026

Uh oh!

JonathanBrouwer commented Feb 26, 2026

Uh oh!

rust-borsBot commented Feb 26, 2026

Uh oh!

JonathanBrouwer commented Feb 26, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-borsBot commented Feb 26, 2026

Uh oh!

rust-borsBot commented Feb 26, 2026

Uh oh!

Uh oh!

rust-timer commented Feb 26, 2026

Uh oh!

github-actionsBot commented Feb 26, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Feb 26, 2026

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

JonathanBrouwer commented Feb 26, 2026

Uh oh!

JonathanBrouwer commented Feb 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants