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

JonathanBrouwer · 2026-03-10T21:46:59Z

Successful merges:

Introduce granular tidy_ctx's check in extra_checks #153560 (Introduce granular tidy_ctx's check in extra_checks)
Add a regression test for #153599 #153666 (Add a regression test for [rustc] ICE in stability_implications: DefId::expect_local called on non-local DefId from core when using reuse with Iterator::fold under staged_api #153599)
Remove FromCycleError trait #153493 (Remove FromCycleError trait)
tests/ui/binop: add annotations for reference rules #153549 (tests/ui/binop: add annotations for reference rules)
Move Spanned. #153641 (Move Spanned.)
Remove TyCtxt::node_lint method and rustc_middle::lint_level function #153663 (Remove TyCtxt::node_lint method and rustc_middle::lint_level function)
Add test for #109804 #153664 (Add test for don't suggest borrowing the Borrow::borrow function item #109804)

Currently extra_checks acts as a single check. It has some downsides: - It is completely sequential. If one sub-check fails, next sub-checks are not executed - sub-checks are not tracked on TidyCtx's failed checks This commit extract those sub-chekcs into separate functions, and call tidy_ctx.start_check() in each function. It also add start_check() for prepare functions (installing python/npm packages) because some sub-checks rely on them.

Currently `QueryVTable`'s `value_from_cycle_error` function pointer uses the `FromCycleError` trait to call query cycle handling code and to construct an erroneous query output value. This trick however relies too heavily on trait impl specialization and makes those impls inconsistent (which is bad AFAIK). Instead this commit directly modifies `value_from_cycle_error` function pointer upon vtable initialization and gets rid of `FromCycleError`.

…stc_codegen_ssa`

…stc_hir_typeck`

…brustdoc`

Close rust-lang#109804.

It's defined in `rustc_span::source_map` which doesn't make any sense because it has nothing to do with source maps. This commit moves it to the crate root, a more sensible spot for something this basic.

…=lolbinarycat,kobzol Introduce granular tidy_ctx's check in extra_checks ## Changes This PR does: - Extract sub checks in extra_checks to each function which takes a reference of TidyCtx - Also extract python/npm dependency install steps to functions. They also calls tidy_ctx.start_check() The changes introduce some benefits: - A failure on one sub-check doesn't stop other sub-check (except py/npm install functions. Because some sub-checks rely on them) - A failure on a sub-check is tracked on TidyCtx's error check Verbose output (shortened): <img width="904" height="1251" alt="image" src="https://github.com/user-attachments/assets/53df4029-a820-467e-b849-ac05c02b396e" /> ## Question I considered that I would decompose each sub-check more so that main.rs calls sub-checks directly and those sub-checks are executed concurrently. But to do so, I think 1. main.rs has to know some implementation details of extra_checks (for example, it might need to know ExtraCheckArg to decide which sub-checks should be called or not), and/or 2. we should decompose extra_checks/ dir to utilize check! macro for sub-checks. I'd like to know your opinion/suggestion.

Add a regression test for rust-lang#153599 Fixes rust-lang#153599 it's already fixed.

@nnethercote

…r, r=nnethercote Remove `FromCycleError` trait Currently `QueryVTable`'s `value_from_cycle_error` function pointer uses the `FromCycleError` trait to call query cycle handling code and to construct an erroneous query output value. This trick however relies too heavily on trait impl specialization and makes those impls inconsistent (which is bad AFAIK). Instead this PR directly modifies `value_from_cycle_error` function pointer upon vtable initialization and gets rid of `FromCycleError`. Removal of `FromCycleError` might also be a desired change for some developers involved in the query system development due to some other reasons. This PR is split up into two commits. **Code formatting changes are isolated into the second commit for better git diffs in the first one.** Nice and simple refactor PR. I got this idea from rust-lang#153470 (comment) discussion and thought it would be a pretty quick change to implement. r? @nnethercote I think this PR would benefit from your reviewer polish.

…nop, r=ehuss tests/ui/binop: add annotations for reference rules

@JonathanBrouwer

…Brouwer Move `Spanned`. It's defined in `rustc_span::source_map` which doesn't make any sense because it has nothing to do with source maps. This commit moves it to the crate root, a more sensible spot for something this basic. r? @JonathanBrouwer

@JonathanBrouwer

…athanBrouwer Remove `TyCtxt::node_lint` method and `rustc_middle::lint_level` function Part of rust-lang#153099. With this PR, we can finally get rid of `lint_level`. \o/ r? @JonathanBrouwer

Add test for rust-lang#109804 Close rust-lang#109804.

…uwer Rollup of 7 pull requests Successful merges: - #153560 (Introduce granular tidy_ctx's check in extra_checks) - #153666 (Add a regression test for #153599) - #153493 (Remove `FromCycleError` trait) - #153549 (tests/ui/binop: add annotations for reference rules) - #153641 (Move `Spanned`.) - #153663 (Remove `TyCtxt::node_lint` method and `rustc_middle::lint_level` function) - #153664 (Add test for #109804)

JonathanBrouwer · 2026-03-10T22:40:17Z

@bors yield
Yielding to the bigger rollup

rust-bors · 2026-03-10T22:40:21Z

Auto build was cancelled. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/22927343209

The next pull request likely to be tested is #153672.

…uwer Rollup of 7 pull requests Successful merges: - #153560 (Introduce granular tidy_ctx's check in extra_checks) - #153666 (Add a regression test for #153599) - #153493 (Remove `FromCycleError` trait) - #153549 (tests/ui/binop: add annotations for reference rules) - #153641 (Move `Spanned`.) - #153663 (Remove `TyCtxt::node_lint` method and `rustc_middle::lint_level` function) - #153664 (Add test for #109804)

rust-bors · 2026-03-11T02:03:23Z

💔 Test for f910675 failed: CI. Failed job:

auto - aarch64-gnu-debug (web logs, enhanced plaintext logs)

rust-log-analyzer · 2026-03-11T02:08:45Z

The job aarch64-gnu-debug failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[1038/5488] Building CXX object tools/clang/utils/TableGen/CMakeFiles/clang-tblgen.dir/ClangBuiltinsEmitter.cpp.o
[1039/5488] Building CXX object tools/clang/utils/TableGen/CMakeFiles/clang-tblgen.dir/ClangAttrEmitter.cpp.o
[1040/5488] Building CXX object tools/clang/utils/TableGen/CMakeFiles/clang-tblgen.dir/ClangBuiltinTemplatesEmitter.cpp.o

Session terminated, killing shell...::group::Clock drift check
  local time: Wed Mar 11 02:02:45 UTC 2026
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
  network time: [1041/5488] Building CXX object tools/clang/utils/TableGen/CMakeFiles/clang-tblgen.dir/ClangCommentCommandInfoEmitter.cpp.o
[1042/5488] Building CXX object tools/clang/utils/TableGen/CMakeFiles/clang-tblgen.dir/ClangCommentHTMLNamedCharacterReferenceEmitter.cpp.o
[1043/5488] Building CXX object tools/clang/utils/TableGen/CMakeFiles/clang-tblgen.dir/ClangCommentHTMLTagsEmitter.cpp.o

JonathanBrouwer · 2026-03-11T04:10:17Z

@bors retry

rust-bors · 2026-03-11T08:25:49Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 13m 26s
Pushing b2fabe3 to main...

rust-timer · 2026-03-11T08:27:49Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#153493	Remove `FromCycleError` trait	`0a76e0bb2c09dd0b1804ebc18c52d8d44df34e7c` (link)
#153549	tests/ui/binop: add annotations for reference rules	`06ab69f9ca115facb34010681617a394c134bd6d` (link)
#153560	Introduce granular tidy_ctx's check in extra_checks	`586577c7fdae4a5e30e1b570045ee5dc7f3c6783` (link)
#153641	Move `Spanned`.	`b6e795d0d097fb59874bce5d714b7b054410269f` (link)
#153663	Remove `TyCtxt::node_lint` method and `rustc_middle::lint_l…	`a91356a34dec7da5e2ed1191df788fde91dcf922` (link)
#153664	Add test for #109804	`6190c8f32d400a61f5632735fec0009090d3e08d` (link)
#153666	Add a regression test for #153599	`a6da727d4bdf60a38e5641e22cf823029d2e988d` (link)

previous master: d1c79458b5

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-03-11T08:28:38Z

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 d1c7945 (parent) -> b2fabe3 (this PR)

Test differences

Show 556 test diffs

Stage 1

[ui] tests/ui/delegation/generics/stability-implications-non-local-defid.rs: [missing] -> pass (J1)
[ui] tests/ui/traits/suggest-remove-reference-in-where-clause.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/delegation/generics/stability-implications-non-local-defid.rs: [missing] -> pass (J0)
[ui] tests/ui/traits/suggest-remove-reference-in-where-clause.rs: [missing] -> pass (J0)

Additionally, 552 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 b2fabe39bde5174e8d728bb85f2b8d0572c35b74 --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-aarch64-apple: 2h 41m -> 1h 37m (-39.4%)
dist-x86_64-apple: 2h 14m -> 1h 45m (-21.7%)
dist-aarch64-llvm-mingw: 1h 28m -> 1h 45m (+19.1%)
x86_64-gnu-llvm-21-2: 1h 39m -> 1h 26m (-12.5%)
x86_64-gnu: 2h 25m -> 2h 9m (-10.6%)
x86_64-gnu-llvm-21-3: 1h 46m -> 1h 57m (+10.3%)
tidy: 2m 37s -> 2m 53s (+10.1%)
x86_64-gnu-llvm-21-1: 1h 14m -> 1h 7m (-9.2%)
dist-powerpc-linux: 1h 23m -> 1h 31m (+9.2%)
aarch64-apple: 2h 59m -> 2h 44m (-8.7%)

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-03-11T09:07:20Z

Finished benchmarking commit (b2fabe3): comparison URL.

Overall result: ❌✅ regressions and 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.3%	[0.3%, 0.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.1%	[-0.1%, -0.1%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary -0.5%)

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.7%	[1.0%, 4.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-6.9%	[-6.9%, -6.9%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (primary -1.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)	-	-	0
Improvements ✅ (primary)	-1.8%	[-1.8%, -1.8%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.8%	[-1.8%, -1.8%]	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.0%	[0.0%, 0.1%]	26
Regressions ❌ (secondary)	0.1%	[0.0%, 0.1%]	19
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[0.0%, 0.1%]	26

Bootstrap: 479.3s -> 479.938s (0.13%)
Artifact size: 396.94 MiB -> 395.01 MiB (-0.49%)

Shunpoco and others added 21 commits March 8, 2026 10:44

address review comments

514f833

address review: use Option for functions which already handle errors

1db5d77

Run code formatter

9418745

Replace TyCtxt::node_lint call with TyCtxt::emit_node_lint in `ru…

916d760

…stc_codegen_ssa`

Replace TyCtxt::node_lint call with TyCtxt::emit_node_lint in `ru…

944d70f

…stc_hir_typeck`

Replace TyCtxt::node_lint call with TyCtxt::emit_node_lint in `li…

c653287

…brustdoc`

Add test for rust-lang#109804

ff67fd0

Close rust-lang#109804.

add a regression test for issue 153599

18ebaa9

Remove TyCtxt::node_lint method

d65ddf6

Remove rustc_middle::lint_level function

2765e4a

tests/ui/binop: add annotations for reference rules

3c3a352

Move Spanned.

c12ab08

It's defined in `rustc_span::source_map` which doesn't make any sense because it has nothing to do with source maps. This commit moves it to the crate root, a more sensible spot for something this basic.

Rollup merge of rust-lang#153666 - TaKO8Ki:issue-153599, r=estebank

618073b

Add a regression test for rust-lang#153599 Fixes rust-lang#153599 it's already fixed.

Rollup merge of rust-lang#153549 - DanielEScherzer:test-references-bi…

d25db64

…nop, r=ehuss tests/ui/binop: add annotations for reference rules

Rollup merge of rust-lang#153663 - GuillaumeGomez:migrate-diag, r=Jon…

3ed43bb

…athanBrouwer Remove `TyCtxt::node_lint` method and `rustc_middle::lint_level` function Part of rust-lang#153099. With this PR, we can finally get rid of `lint_level`. \o/ r? @JonathanBrouwer

Rollup merge of rust-lang#153664 - estebank:issue-109804, r=lqd

e23436f

Add test for rust-lang#109804 Close rust-lang#109804.

rust-bors bot added the rollup A PR which is a rollup label Mar 10, 2026

This comment has been minimized.

Sign in to view

rust-bors bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2026

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 Mar 11, 2026

This comment has been minimized.

Sign in to view

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 Mar 11, 2026

rust-bors bot merged commit b2fabe3 into rust-lang:main Mar 11, 2026
14 of 23 checks passed

rustbot added this to the 1.96.0 milestone Mar 11, 2026

This was referenced Mar 11, 2026

Simplify type_of_opaque. #153581

Open

interpret: go back to regular string interpolation for error messages #153611

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#153673

Rollup of 7 pull requests#153673
rust-bors[bot] merged 21 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-cGOKonI

JonathanBrouwer commented Mar 10, 2026 •

edited by rustbot

Loading

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Mar 10, 2026

Uh oh!

rust-bors bot commented Mar 10, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 11, 2026

Uh oh!

rust-log-analyzer commented Mar 11, 2026

Uh oh!

JonathanBrouwer commented Mar 11, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 11, 2026

Uh oh!

Uh oh!

rust-timer commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented Mar 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Conversation

JonathanBrouwer commented Mar 10, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Mar 10, 2026

Uh oh!

rust-bors bot commented Mar 10, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 11, 2026

Uh oh!

rust-log-analyzer commented Mar 11, 2026

Uh oh!

JonathanBrouwer commented Mar 11, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 11, 2026

Uh oh!

Uh oh!

rust-timer commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Mar 11, 2026

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

JonathanBrouwer commented Mar 10, 2026 •

edited by rustbot

Loading