Rollup of 6 pull requests #143521

matthiaskrgr · 2025-07-06T08:03:25Z

Successful merges:

mbe: Defer checks for compile_error! until reporting an unused macro rule #143416 (mbe: Defer checks for compile_error! until reporting an unused macro rule)
std: sys: net: uefi: tcp4: Implement read #143470 (std: sys: net: uefi: tcp4: Implement read)
use is_multiple_of and div_ceil #143477 (use is_multiple_of and div_ceil)
distinguish the duplicate item of rpitit #143484 (distinguish the duplicate item of rpitit)
tidy: use --bless for tidy spellcheck instead of spellcheck:fix #143493 (tidy: use --bless for tidy spellcheck instead of spellcheck:fix)
compiletest: print slightly more information on fs::write failure #143504 (compiletest: print slightly more information on fs::write failure)

r? @ghost
@rustbot modify labels: rollup

A blocking implementation of tcp4 read. Signed-off-by: Ayush Singh <[email protected]>

Rather than a `bool` that's `true` for the LHS and `false` for the RHS, use a self-documenting enum.

previous behavior was inconsistent with existing extra checks.

The parser repeatedly invokes the `parse` function, constructing a one-entry vector, and assuming that the return value will be a one-entry vector. Add a helper for that case. This will simplify adding additional callers, and put all the logic in one place to allow potential future simplification of the one-TT case.

…o rule The MBE parser checks rules at initial parse time to see if their RHS has `compile_error!` in it, and returns a list of rule indexes and LHS spans that don't map to `compile_error!`, for use in unused macro rule checking. Instead, have the unused macro rule reporting ask the macro for the rule to report, and let the macro check at that time. That avoids checking rules unless they're unused. In the process, refactor the data structure used to store macro rules, to group the LHS and RHS (and LHS span) of each rule together, and refactor the unused rule tracking to only track rule indexes. This ends up being a net simplification, and reduction in code size.

…r=nnethercote mbe: Defer checks for `compile_error!` until reporting an unused macro rule The current MBE parser checks rules at initial parse time to see if their RHS has `compile_error!` in it, and returns a list of rule indexes and LHS spans that don't map to `compile_error!`, for use in unused macro rule checking. Instead, have the unused macro rule reporting ask the macro for the rule to report, and let the macro check at that time. That avoids checking rules unless they're unused. In the process, refactor the data structure used to store macro rules, to group the LHS and RHS (and LHS span) of each rule together, and refactor the unused rule tracking to only track rule indexes. This builds atop a couple of minor MBE refactors. I would suggest reviewing commit-by-commit. The overall result is a further simplification of the macro code.

…iplett std: sys: net: uefi: tcp4: Implement read - A blocking implementation of tcp4 read. - Basically a copy of [write](rust-lang#141532)

…oshtriplett use `is_multiple_of` and `div_ceil` In tricky logic, these functions are much more informative than the manual implementations. They also catch subtle bugs: - the manual `is_multiple_of` often does not handle division by zero - manual `div_ceil` often does not consider overflow The transformation is free for `is_multiple_of` if the divisor is compile-time known to be non-zero. For `div_ceil` there is a small cost to considering overflow. Here is some assembly https://godbolt.org/z/5zP8KaE1d.

…rrors distinguish the duplicate item of rpitit Fixes rust-lang#140796 r? compiler cc `@Zoxc`

…, r=Kobzol tidy: use --bless for tidy spellcheck instead of spellcheck:fix previous behavior was inconsistent with existing extra checks. unsure if this needs a change tracker entry or a warning for people who try to use the old behavior. unsure if we should call this `spellcheck:lint` for consistency. making this consistent is a prerequisite for rust-lang#143398 cc `@nnethercote` r? `@Kobzol`

compiletest: print slightly more information on fs::write failure See [#t-infra > compiletest: panic in dump_output_file: No such file or dire @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/compiletest.3A.20panic.20in.20dump_output_file.3A.20No.20such.20file.20or.20dire/near/527294714)

matthiaskrgr · 2025-07-06T08:03:43Z

@bors r+ rollup=never p=5

bors · 2025-07-06T08:03:46Z

📌 Commit 097efc0 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-07-06T10:20:30Z

⌛ Testing commit 097efc0 with merge c83e217...

bors · 2025-07-06T13:21:02Z

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

rust-timer · 2025-07-06T13:22:45Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#143416	mbe: Defer checks for `compile_error!` until reporting an u…	`9d6629f75d3810ad94c1595475bd2aee9f0dcbc3` (link)
#143470	std: sys: net: uefi: tcp4: Implement read	`c9362649b63d6e69a4e4501e5dd2304155627366` (link)
#143477	use `is_multiple_of` and `div_ceil`	`edd4f48a3d282ca396754378b6628822f9163b9a` (link)
#143484	distinguish the duplicate item of rpitit	`58f771e6a773bc5ea09acfe446304204af955454` (link)
#143493	tidy: use --bless for tidy spellcheck instead of spellcheck…	`6a3316f3b3c9a25faf2fa0289d42e052a27624e4` (link)
#143504	compiletest: print slightly more information on fs::write f…	`9cf76edb9449a46e77e900e23e57509773131146` (link)

previous master: e804cd4a5f

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-07-06T13:23:41Z

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 e804cd4 (parent) -> c83e217 (this PR)

Test differences

Show 5 test diffs

Stage 1

[ui] tests/ui/impl-trait/in-trait/rpitit-duplicate-associated-fn.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/ui/impl-trait/in-trait/rpitit-duplicate-associated-fn.rs: [missing] -> pass (J1)

Additionally, 3 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 c83e217d268d25960a0c79c6941bcb3917a6a0af --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: 3965.9s -> 5079.7s (28.1%)
x86_64-gnu-llvm-19-1: 3236.2s -> 3801.8s (17.5%)
dist-x86_64-apple: 9367.2s -> 7795.6s (-16.8%)
i686-gnu-2: 5169.6s -> 6036.9s (16.8%)
x86_64-rust-for-linux: 2594.5s -> 2947.9s (13.6%)
arm-android: 5703.9s -> 6353.7s (11.4%)
x86_64-gnu-debug: 5380.1s -> 5951.8s (10.6%)
i686-gnu-nopt-1: 7058.9s -> 7789.3s (10.3%)
armhf-gnu: 4815.1s -> 5310.6s (10.3%)
x86_64-gnu-aux: 6048.3s -> 6640.6s (9.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-06T21:45:48Z

Finished benchmarking commit (c83e217): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.2%, 0.2%]	1
Regressions ❌ (secondary)	0.3%	[0.2%, 0.3%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.2%	[-1.9%, -0.0%]	9
All ❌✅ (primary)	0.2%	[0.2%, 0.2%]	1

Max RSS (memory usage)

Results (primary 1.4%, 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)	4.4%	[2.3%, 6.8%]	3
Regressions ❌ (secondary)	7.7%	[7.7%, 7.7%]	1
Improvements ✅ (primary)	-3.1%	[-5.0%, -1.3%]	2
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	1.4%	[-5.0%, 6.8%]	5

Cycles

Results (primary 2.2%)

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

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

Binary size

Results (primary 0.0%, secondary 0.0%)

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

	mean	range	count
Regressions ❌ (primary)	0.1%	[0.0%, 0.2%]	7
Regressions ❌ (secondary)	0.1%	[0.1%, 0.1%]	1
Improvements ✅ (primary)	-0.0%	[-0.1%, -0.0%]	2
Improvements ✅ (secondary)	-0.0%	[-0.0%, -0.0%]	4
All ❌✅ (primary)	0.0%	[-0.1%, 0.2%]	9

Bootstrap: 462.855s -> 461.809s (-0.23%)
Artifact size: 372.14 MiB -> 372.19 MiB (0.02%)

panstromek · 2025-07-07T15:21:26Z

perf triage:

coercions regressions seems to be noise, looks like a new bimodailty. Other changes are tiny, I don't think this is worth investigating.

@rustbot label: +perf-regression-triaged

Ayush1325 and others added 18 commits July 5, 2025 11:10

std: sys: net: uefi: tcp4: Implement read

1f01d9b

A blocking implementation of tcp4 read. Signed-off-by: Ayush Singh <[email protected]>

use is_multiple_of instead of manual modulo

226b0fb

use div_ceil instead of manual logic

ed3711e

mbe: Introduce an enum for which part of a rule we're parsing

6b71399

Rather than a `bool` that's `true` for the LHS and `false` for the RHS, use a self-documenting enum.

tidy: use --bless for tidy spellcheck instead of spellcheck:fix

971feb6

previous behavior was inconsistent with existing extra checks.

tidy: add specific error message for trying to use spellcheck:fix.

c1ed2ac

compiletest: print slightly more information on fs::write failure

9c9c5b0

bootstrap: add change_tracker entry for removal of spellcheck:fix

9f78173

mbe: Simplify a match to a let-else

0d5ab3e

distinguish the duplicate item of rpitit

5bbab89

Rollup merge of rust-lang#143470 - Ayush1325:uefi-tcp4-recv, r=joshtr…

19f8ba4

…iplett std: sys: net: uefi: tcp4: Implement read - A blocking implementation of tcp4 read. - Basically a copy of [write](rust-lang#141532)

Rollup merge of rust-lang#143484 - bvanjoi:issue-140796, r=compiler-e…

534c09a

…rrors distinguish the duplicate item of rpitit Fixes rust-lang#140796 r? compiler cc `@Zoxc`

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

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

bors merged commit c83e217 into rust-lang:master Jul 6, 2025
12 checks passed

rustbot added this to the 1.90.0 milestone Jul 6, 2025

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

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests #143521

Rollup of 6 pull requests #143521

matthiaskrgr commented Jul 6, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Jul 6, 2025

Uh oh!

bors commented Jul 6, 2025

Uh oh!

bors commented Jul 6, 2025

Uh oh!

bors commented Jul 6, 2025

Uh oh!

Uh oh!

rust-timer commented Jul 6, 2025

Uh oh!

github-actions bot commented Jul 6, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Jul 6, 2025

Uh oh!

panstromek commented Jul 7, 2025

Uh oh!

Uh oh!

Rollup of 6 pull requests #143521

Rollup of 6 pull requests #143521

Conversation

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

Uh oh!

Uh oh!

matthiaskrgr commented Jul 6, 2025

Uh oh!

bors commented Jul 6, 2025

Uh oh!

bors commented Jul 6, 2025

Uh oh!

bors commented Jul 6, 2025

Uh oh!

Uh oh!

rust-timer commented Jul 6, 2025

Uh oh!

github-actions bot commented Jul 6, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Jul 6, 2025

Overall result: ❌✅ regressions and improvements - please read the text below

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

panstromek commented Jul 7, 2025

Uh oh!

Uh oh!

matthiaskrgr commented Jul 6, 2025 •

edited by rustbot

Loading