Rollup of 12 pull requests #143731

matthiaskrgr · 2025-07-10T13:19:37Z

Successful merges:

Add checking for unnecessary delims in closure body #136906 (Add checking for unnecessary delims in closure body)
docs: document trait upcasting rules in Unsize trait #143652 (docs: document trait upcasting rules in Unsize trait)
Resolver: refact macro map into external and local maps #143657 (Resolver: refact macro map into external and local maps)
Use "Innermost" & "Outermost" terminology for AttributeOrder #143659 (Use "Innermost" & "Outermost" terminology for AttributeOrder)
fix: correct typo in attr_parsing_previously_accepted message key #143663 (fix: correct typo in attr_parsing_previously_accepted message key)
Re-expose nested bodies in rustc_borrowck::consumers #143666 (Re-expose nested bodies in rustc_borrowck::consumers)
Fix VxWorks build errors #143668 (Fix VxWorks build errors)
Add a new maintainer to the wasm32-wasip1 target #143670 (Add a new maintainer to the wasm32-wasip1 target)
improve lint doc text #143675 (improve lint doc text)
Assorted run-make-support maintenance #143683 (Assorted run-make-support maintenance)
Auto-add S-waiting-on-author when the PR is/switches to draft state #143695 (Auto-add S-waiting-on-author when the PR is/switches to draft state)
triagebot.toml: ping lolbinarycat if tidy extra checks were modified #143706 (triagebot.toml: ping lolbinarycat if tidy extra checks were modified)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Hopelessly outdated, and this support library is purely internal.

Purely internal test support library.

Even if the formatting isn't strictly "better", it at least allows rustfmtting it automatically.

…nd local_macro_map.

And not both `is_windows_msvc` and `is_msvc`.

…re-body, r=oli-obk Add checking for unnecessary delims in closure body Fixes rust-lang#136741

…, r=compiler-errors docs: document trait upcasting rules in `Unsize` trait The trait upcasting feature stabilized in 1.86 added new `Unsize` implementation, but this wasn't reflected in the trait's documentation.

…r=petrochenkov Resolver: refact macro map into external and local maps Puts `MacroData` inside of the `ResolverArena` and splits `macro_map` into 2 maps: `local_macro_map` and `external_macro_map`. This way `get_macro_by_def_id` can take a `&Resolver` instead of a mutable one. Part of [#gsoc > Project: Parallel Macro Expansion](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/with/516965603) r? `@petrochenkov`

…r, r=jdonszelmann Use "Innermost" & "Outermost" terminology for `AttributeOrder` Follow-up to rust-lang#143603. https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/attribute.20parsing.20rework/near/527768926 Also remove some outdated comments. cc `@jdonszelmann`

fix: correct typo in attr_parsing_previously_accepted message key

…rs, r=lcnr Re-expose nested bodies in rustc_borrowck::consumers After rust-lang#138499, it's not possible anymore to get borrowck information for nested bodies via `get_body_with_borrowck_facts`. This PR re-exposes nested bodies by returning a map containing the typeck root and all its nested bodies. To collect the bodies, a map is added to `BorrowCheckRootCtxt`, and a body is inserted every time `do_mir_borrowck` is called. r? ``@lcnr``

Fix VxWorks build errors fixes rust-lang#143442 r? ``@Noratrieb``

…maintainer, r=alexcrichton Add a new maintainer to the wasm32-wasip1 target cc: `@alexcrichton`

improve lint doc text

Assorted `run-make-support` maintenance This PR should contain no functional changes. - Commit 1: Removes the support library's CHANGELOG. In the very beginning, I thought maybe we would try to version this library. But this is a purely internal test support library, and it's just extra busywork trying to maintain changelog/versions. It's also hopelessly outdated. - Commit 2: Resets version number to `0.0.0`. Ditto on busywork. - Commit 3: Bump `run-make-support` to Edition 2024. The support library was already "compliant" with Edition 2024. - Commit 4: Slightly organizes the support library dependencies. - Commit 5: Previously, I tried hopelessly to maintain some manual formatting, but that was annoying because it required skipping rustfmt (so export ordering etc. could not be extra formatted). Give up, and do some rearrangements / module prefix tricks to get the `lib.rs` looking at least *reasonable*. IMO this is not a strict improvement, but I rather regain the ability to auto-format it with rustfmt. - Commit {6,7}: Noticed in rust-lang#143669 that we apparently had *both* {`is_msvc`, `is_windows_msvc`}. This PR removes `is_msvc` in favor of `is_windows_msvc` to make it unambiguous (and only retain one way of gating) as there are some UEFI targets which are MSVC but not Windows. Best reviewed commit-by-commit. r? `@Kobzol`

matthiaskrgr · 2025-07-10T13:19:52Z

@bors r+ rollup=never p=5

bors · 2025-07-10T13:19:56Z

📌 Commit bd2a351 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-07-10T13:49:40Z

⌛ Testing commit bd2a351 with merge 78a6e13...

bors · 2025-07-10T16:50:51Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 78a6e13 to master...

github-actions · 2025-07-10T16:53:43Z

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 119574f (parent) -> 78a6e13 (this PR)

Test differences

Show 82 test diffs

Stage 1

[ui] tests/ui/lint/unused/closure-body-issue-136741.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/ui/lint/unused/closure-body-issue-136741.rs: [missing] -> pass (J1)

Additionally, 80 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 78a6e132984dba0303ebad7dcfd1305c93ad5835 --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

x86_64-apple-2: 4557.4s -> 3638.3s (-20.2%)
x86_64-msvc-ext1: 6784.1s -> 7927.2s (16.9%)
x86_64-apple-1: 6768.6s -> 7582.6s (12.0%)
pr-check-1: 1636.3s -> 1825.9s (11.6%)
dist-aarch64-apple: 5700.1s -> 6354.4s (11.5%)
x86_64-gnu-miri: 4683.3s -> 5111.6s (9.1%)
dist-ohos-x86_64: 3875.7s -> 4213.4s (8.7%)
x86_64-gnu-llvm-20-1: 3468.9s -> 3763.4s (8.5%)
x86_64-gnu-llvm-19-1: 3617.9s -> 3885.0s (7.4%)
dist-i586-gnu-i586-i686-musl: 5455.0s -> 5826.5s (6.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.

rust-timer · 2025-07-10T16:54:17Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#136906	Add checking for unnecessary delims in closure body	`936033ae7e78f4d2f39babc0c41a72bdb970427f` (link)
#143652	docs: document trait upcasting rules in `Unsize` trait	`86fa07589b2ad5cb7cf4b9b3eecbaa5dacff6129` (link)
#143657	Resolver: refact macro map into external and local maps	`c212528b44c90064928561718247faf874884e3d` (link)
#143659	Use "Innermost" & "Outermost" terminology for `AttributeOrd…	`aab67731f0fd18e9a612a66cce8dc7616693b145` (link)
#143663	fix: correct typo in attr_parsing_previously_accepted messa…	`5c080d90080eb4e9a54de1f6eebc79b02426d213` (link)
#143666	Re-expose nested bodies in rustc_borrowck::consumers	`85cfd4aba710665e8c81f7421340d611bb4faa9b` (link)
#143668	Fix VxWorks build errors	`640ff21bf9384d325f815545985bca4a594085cd` (link)
#143670	Add a new maintainer to the wasm32-wasip1 target	`fe5a747d10be3e3120552e303b03194186da6c77` (link)
#143675	improve lint doc text	`43ce36884a8bc321bc5ea3c7ed434356adbe7f66` (link)
#143683	Assorted `run-make-support` maintenance	`03be3a85a95183a4ad7b60d2033f8b586b73a75f` (link)
#143695	Auto-add `S-waiting-on-author` when the PR is/switches to d…	`32d81e6abddb49ce8c09d295a515f6b1a30a26e6` (link)
#143706	triagebot.toml: ping lolbinarycat if tidy extra checks were…	`51f4817c2df122397e9135f0f9ac4f95e9d37526` (link)

previous master: 119574f835

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-timer · 2025-07-10T18:02:07Z

Finished benchmarking commit (78a6e13): comparison URL.

Overall result: ❌ regressions - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

If the regression was expected or you think it can be justified,
please write a comment with sufficient written justification, and add
@rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
If you think that you know of a way to resolve the regression, try to create
a new PR with a fix for the regression.
If you do not understand the regression or you think that it is just noise,
you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.2%	[0.1%, 0.4%]	12
Regressions ❌ (secondary)	0.3%	[0.1%, 0.9%]	14
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[0.1%, 0.4%]	12

Max RSS (memory usage)

Results (primary 0.5%, secondary -0.8%)

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

	mean	range	count
Regressions ❌ (primary)	1.4%	[0.7%, 3.9%]	7
Regressions ❌ (secondary)	2.5%	[2.2%, 2.8%]	5
Improvements ✅ (primary)	-5.5%	[-5.5%, -5.5%]	1
Improvements ✅ (secondary)	-4.1%	[-5.9%, -2.2%]	5
All ❌✅ (primary)	0.5%	[-5.5%, 3.9%]	8

Cycles

Results (primary 2.7%, secondary 6.6%)

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

	mean	range	count
Regressions ❌ (primary)	2.7%	[2.1%, 3.6%]	8
Regressions ❌ (secondary)	9.8%	[5.0%, 13.0%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	[-3.6%, -2.5%]	2
All ❌✅ (primary)	2.7%	[2.1%, 3.6%]	8

Binary size

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

Bootstrap: 463.013s -> 465.766s (0.59%)
Artifact size: 374.51 MiB -> 374.54 MiB (0.01%)

Kobzol · 2025-07-10T20:55:02Z

Regression comes from #136906, continuing discussion there.

@rustbot label: +perf-regression-triaged

moulins and others added 30 commits July 8, 2025 23:35

docs: document trait upcasting rules in Unsize trait

c9ff160

Use "Innermost" & "Outermost" terminology for AttributeOrder

e391578

fix: correct typo in attr_parsing_previously_accepted message key

ba4235b

Expose nested bodies in rustc_borrowck::consumers

3c7bf9f

Fix VxWorks build errors

6637335

Add a new maintainer to the wasm32-wasip1 target

15940b8

improve lint doc text

43bc40f

Remove run-make-support CHANGELOG

8d58d5e

Hopelessly outdated, and this support library is purely internal.

Don't attempt to version run-make-support

ed520af

Purely internal test support library.

Bump run-make-support to Edition 2024

e70493d

Sort and document run-make-support dependencies

fae1546

Massage lib.rs so it can be rustfmt'd

200f132

Even if the formatting isn't strictly "better", it at least allows rustfmtting it automatically.

Auto-add S-waiting-on-author when the PR is/switches to draft state

5339629

triagebot.toml: ping lolbinarycat if tidy extra checks were modified

7e2527d

MacroData in ResolverArenas + split macro_map into extern_macro_map a…

e9e31b1

…nd local_macro_map.

Use reference for MacroRulesScopeRef instead of Interned.

e566783

Remove uncessary parens in closure body with unused lint

93db9e7

remove unnecessary parens in rust-analyzer

4dc954f

Only provide is_windows_msvc to gate on windows-msvc

87a4121

And not both `is_windows_msvc` and `is_msvc`.

Use is_windows_msvc instead of is_msvc in run-make tests

3f4f23a

Rollup merge of rust-lang#136906 - chenyukang:yukang-fix-136741-closu…

a0c7887

…re-body, r=oli-obk Add checking for unnecessary delims in closure body Fixes rust-lang#136741

Rollup merge of rust-lang#143663 - dillona:fix-typo, r=jdonszelmann

4b26882

fix: correct typo in attr_parsing_previously_accepted message key

Rollup merge of rust-lang#143668 - biabbas:vxworks, r=Noratrieb

a17559b

Fix VxWorks build errors fixes rust-lang#143442 r? ``@Noratrieb``

Rollup merge of rust-lang#143670 - loganek:loganek/wasm32-wasip1-new-…

9ee9b0e

…maintainer, r=alexcrichton Add a new maintainer to the wasm32-wasip1 target cc: `@alexcrichton`

Rollup merge of rust-lang#143675 - hkBst:overflowing-1, r=oli-obk

8c5398a

improve lint doc text

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 Jul 10, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 10, 2025

bors merged commit 78a6e13 into rust-lang:master Jul 10, 2025
12 checks passed

rustbot added this to the 1.90.0 milestone Jul 10, 2025

rustbot added the perf-regression Performance regression. label Jul 10, 2025

This was referenced Jul 10, 2025

Resolver: refact macro map into external and local maps #143657

Merged

Add checking for unnecessary delims in closure body #136906

Merged

Re-expose nested bodies in rustc_borrowck::consumers #143666

Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jul 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 12 pull requests #143731

Rollup of 12 pull requests #143731

Uh oh!

matthiaskrgr commented Jul 10, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Jul 10, 2025

Uh oh!

bors commented Jul 10, 2025

Uh oh!

bors commented Jul 10, 2025

Uh oh!

bors commented Jul 10, 2025

Uh oh!

Uh oh!

github-actions bot commented Jul 10, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Jul 10, 2025

Uh oh!

rust-timer commented Jul 10, 2025

Uh oh!

Kobzol commented Jul 10, 2025

Uh oh!

Uh oh!

Rollup of 12 pull requests #143731

Rollup of 12 pull requests #143731

Uh oh!

Conversation

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

Uh oh!

Uh oh!

matthiaskrgr commented Jul 10, 2025

Uh oh!

bors commented Jul 10, 2025

Uh oh!

bors commented Jul 10, 2025

Uh oh!

bors commented Jul 10, 2025

Uh oh!

Uh oh!

github-actions bot commented Jul 10, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Jul 10, 2025

Uh oh!

rust-timer commented Jul 10, 2025

Overall result: ❌ regressions - please read the text below

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Kobzol commented Jul 10, 2025

Uh oh!

Uh oh!

matthiaskrgr commented Jul 10, 2025 •

edited by rustbot

Loading