Rollup of 6 pull requests by matthiaskrgr · Pull Request #149515 · rust-lang/rust

matthiaskrgr · 2025-12-01T17:35:14Z

Successful merges:

expand valid edition range for use-path-segment-kw.rs #149393 (expand valid edition range for use-path-segment-kw.rs)
Make the capitalization explicit on keyword misspell error #149427 (Make the capitalization explicit on keyword misspell error)
Use a delayed bug for this layout ICE #149433 (Use a delayed bug for this layout ICE)
Tidying up UI tests [7/N] #149473 (Tidying up UI tests [7/N])
Update the comment in the add_typo_suggestion function #149505 (Update the comment in the add_typo_suggestion function)
rust-analyzer subtree update #149513 (rust-analyzer subtree update)

r? @ghost
@rustbot modify labels: rollup

Fixes 144501

tests/ui/invalid-module-declaration/invalid-module-declaration.rs duplicated of tests/ui/modules/missing_non_modrs_mod_inline.rs

fix explicit-call-to-dtor.rs fix explicit-call-to-supertrait-dtor.rs merge issues/issue-17740.rs with lifetimes/explicit-self-lifetime-mismatch.rs merge bare-fn-start.rs and trait-fn.rs into invalid-self-argument.rs add comment tests/ui/traits/catch-unwind-cell-interior-mut

fix: Fix proc-macro-srv passing invalid extra none group to proc-macros

expand valid edition range for use-path-segment-kw.rs

…szelmann Make the capitalization explicit on keyword misspell error Will help for rust-lang#149405.

…szelmann Use a delayed bug for this layout ICE Fixes rust-lang#144501 cc `@matthiaskrgr`

Tidying up UI tests [7/N] > [!NOTE] > Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge. part of rust-lang#133895 removed directory `tests/ui/explicit`, `tests/ui/interior-mutability`, `tests/ui/invalid-module-declaration`, tests/ui/invalid-self-argument` r? Kivooeo

Update the comment in the add_typo_suggestion function This comment was added to rust-lang@089810a. However, the test for the comment was moved elsewhere in rust-lang#145897.

`rust-analyzer` subtree update Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@f25db55. Created using https://github.com/rust-lang/josh-sync. r? `@ghost` Last one for now...

matthiaskrgr · 2025-12-01T17:35:29Z

@bors r+ rollup=never p=5

bors · 2025-12-01T17:35:32Z

📌 Commit c99912d has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-12-01T20:29:36Z

⌛ Testing commit c99912d with merge 1d60f9e...

bors · 2025-12-01T23:42:31Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 1d60f9e to main...

rust-timer · 2025-12-01T23:44:17Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#149393	expand valid edition range for use-path-segment-kw.rs	`5252b6793f1aa1ae924e36112286c922330c25f1` (link)
#149427	Make the capitalization explicit on keyword misspell error	`81c05192e2e203d2590800239934085674cfcefe` (link)
#149433	Use a delayed bug for this layout ICE	`fe7feecd1e47e8b2959264860a862d045220eef8` (link)
#149473	Tidying up UI tests [7/N]	`9428dff639973b91b1a6520ecdd9d41af62d1528` (link)
#149505	Update the comment in the add_typo_suggestion function	`8c570e447ab3b460fc4197fd696fa2e0ec95fd4e` (link)
#149513	`rust-analyzer` subtree update	`779399ffcad0c916cd0cbcd7808b677feb58bb97` (link)

previous master: a463b0e2ee

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 · 2025-12-01T23:45:46Z

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 a463b0e (parent) -> 1d60f9e (this PR)

Test differences

Show 36 test diffs

Stage 1

[ui] tests/ui/drop/explicit-call-to-dtor.rs: [missing] -> pass (J1)
[ui] tests/ui/drop/explicit-call-to-supertrait-dtor.rs: [missing] -> pass (J1)
[ui] tests/ui/enum-discriminant/invalid-niche-discriminant.rs#normal: [missing] -> pass (J1)
[ui] tests/ui/enum-discriminant/invalid-niche-discriminant.rs#with_delayed: [missing] -> pass (J1)
[ui] tests/ui/explicit/explicit-call-to-dtor.rs: pass -> [missing] (J1)
[ui] tests/ui/explicit/explicit-call-to-supertrait-dtor.rs: pass -> [missing] (J1)
[ui] tests/ui/explicit/explicit-self-lifetime-mismatch.rs: pass -> [missing] (J1)
[ui] tests/ui/interior-mutability/interior-mutability.rs: pass -> [missing] (J1)
[ui] tests/ui/invalid-module-declaration/invalid-module-declaration.rs: pass -> [missing] (J1)
[ui] tests/ui/invalid-self-argument/bare-fn-start.rs: pass -> [missing] (J1)
[ui] tests/ui/invalid-self-argument/bare-fn.rs: pass -> [missing] (J1)
[ui] tests/ui/invalid-self-argument/trait-fn.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-17740.rs: pass -> [missing] (J1)
[ui] tests/ui/lifetimes/explicit-self-lifetime-mismatch.rs: [missing] -> pass (J1)
[ui] tests/ui/self/invalid-self-argument.rs: [missing] -> pass (J1)
[ui] tests/ui/traits/catch-unwind-cell-interior-mut.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/drop/explicit-call-to-dtor.rs: [missing] -> pass (J0)
[ui] tests/ui/drop/explicit-call-to-supertrait-dtor.rs: [missing] -> pass (J0)
[ui] tests/ui/explicit/explicit-call-to-dtor.rs: pass -> [missing] (J0)
[ui] tests/ui/explicit/explicit-call-to-supertrait-dtor.rs: pass -> [missing] (J0)
[ui] tests/ui/explicit/explicit-self-lifetime-mismatch.rs: pass -> [missing] (J0)
[ui] tests/ui/interior-mutability/interior-mutability.rs: pass -> [missing] (J0)
[ui] tests/ui/invalid-module-declaration/invalid-module-declaration.rs: pass -> [missing] (J0)
[ui] tests/ui/invalid-self-argument/bare-fn-start.rs: pass -> [missing] (J0)
[ui] tests/ui/invalid-self-argument/bare-fn.rs: pass -> [missing] (J0)
[ui] tests/ui/invalid-self-argument/trait-fn.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-17740.rs: pass -> [missing] (J0)
[ui] tests/ui/lifetimes/explicit-self-lifetime-mismatch.rs: [missing] -> pass (J0)
[ui] tests/ui/self/invalid-self-argument.rs: [missing] -> pass (J0)
[ui] tests/ui/traits/catch-unwind-cell-interior-mut.rs: [missing] -> pass (J0)
[ui] tests/ui/enum-discriminant/invalid-niche-discriminant.rs#normal: [missing] -> pass (J2)
[ui] tests/ui/enum-discriminant/invalid-niche-discriminant.rs#with_delayed: [missing] -> pass (J2)
[ui] tests/ui/enum-discriminant/invalid-niche-discriminant.rs#normal: [missing] -> ignore (ignored if rustc wasn't built with debug assertions) (J3)
[ui] tests/ui/enum-discriminant/invalid-niche-discriminant.rs#with_delayed: [missing] -> ignore (ignored if rustc wasn't built with debug assertions) (J3)

Additionally, 2 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 1d60f9e070c1039b263e0f035c0f03dfcc610d0f --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-apple-various: 4235.8s -> 3676.2s (-13.2%)
dist-aarch64-msvc: 5405.4s -> 6015.0s (+11.3%)
dist-x86_64-msvc-alt: 8966.3s -> 9820.3s (+9.5%)
x86_64-msvc-ext2: 5394.7s -> 5879.7s (+9.0%)
aarch64-apple: 10767.6s -> 9847.1s (-8.5%)
dist-i686-mingw: 10230.8s -> 9458.5s (-7.5%)
x86_64-gnu-llvm-20: 2963.7s -> 2740.1s (-7.5%)
x86_64-gnu-miri: 4460.0s -> 4791.7s (+7.4%)
pr-check-1: 1769.5s -> 1886.8s (+6.6%)
x86_64-gnu-llvm-21-1: 3483.2s -> 3711.3s (+6.5%)

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 · 2025-12-02T01:03:09Z

Finished benchmarking commit (1d60f9e): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results (secondary 2.6%)

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.6%	[2.6%, 2.6%]	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: 471.474s -> 471.751s (0.06%)
Artifact size: 386.95 MiB -> 386.95 MiB (0.00%)

tshepang and others added 14 commits November 27, 2025 19:33

expand valid edition range for use-path-segment-kw.rs

8762fba

Make the capitalization explicit on keyword misspell error

85e24b0

Use a delayed bug for this layout ICE

673be1b

Fixes 144501

moved and delete test

77afccf

tests/ui/invalid-module-declaration/invalid-module-declaration.rs duplicated of tests/ui/modules/missing_non_modrs_mod_inline.rs

Update the comment in the add_typo_suggestion function

31106eb

fix: Fix proc-macro-srv passing invalid extra none group to proc-macros

c435a5f

Merge pull request rust-lang#21190 from Veykril/push-puqrkvrtqxnz

d9beb0a

fix: Fix proc-macro-srv passing invalid extra none group to proc-macros

Rollup merge of rust-lang#149393 - tshepang:patch-3, r=davidtwco

9d829ac

expand valid edition range for use-path-segment-kw.rs

Rollup merge of rust-lang#149427 - scrabsha:push-rxkwyumxrrtu, r=jdon…

14da32f

…szelmann Make the capitalization explicit on keyword misspell error Will help for rust-lang#149405.

Rollup merge of rust-lang#149433 - scottmcm:delay-layout-ICEs, r=jdon…

ab2cdfc

…szelmann Use a delayed bug for this layout ICE Fixes rust-lang#144501 cc `@matthiaskrgr`

Rollup merge of rust-lang#149505 - reddevilmidzy:fix, r=WaffleLapkin

453fca5

Update the comment in the add_typo_suggestion function This comment was added to rust-lang@089810a. However, the test for the comment was moved elsewhere in rust-lang#145897.

Rollup merge of rust-lang#149513 - lnicola:sync-from-ra, r=lnicola

c99912d

`rust-analyzer` subtree update Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@f25db55. Created using https://github.com/rust-lang/josh-sync. r? `@ghost` Last one for now...

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 1, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 1, 2025

bors merged commit 1d60f9e into rust-lang:main Dec 1, 2025
12 checks passed

rustbot added this to the 1.93.0 milestone Dec 1, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests#149515

Rollup of 6 pull requests#149515
bors merged 14 commits intorust-lang:mainfrom
matthiaskrgr:rollup-djmciuc

matthiaskrgr commented Dec 1, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Dec 1, 2025

Uh oh!

bors commented Dec 1, 2025

Uh oh!

bors commented Dec 1, 2025

Uh oh!

bors commented Dec 1, 2025

Uh oh!

Uh oh!

rust-timer commented Dec 1, 2025

Uh oh!

github-actions bot commented Dec 1, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Dec 2, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

matthiaskrgr commented Dec 1, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthiaskrgr commented Dec 1, 2025

Uh oh!

bors commented Dec 1, 2025

Uh oh!

bors commented Dec 1, 2025

Uh oh!

bors commented Dec 1, 2025

Uh oh!

Uh oh!

rust-timer commented Dec 1, 2025

Uh oh!

github-actions bot commented Dec 1, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Dec 2, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

matthiaskrgr commented Dec 1, 2025 •

edited by rustbot

Loading