Rollup of 4 pull requests #143526

matthiaskrgr · 2025-07-06T13:56:15Z

Successful merges:

Rewrite empty attribute lint for new attribute parser #143252 (Rewrite empty attribute lint for new attribute parser)
Use object crate from crates.io to fix windows build error #143492 (Use object crate from crates.io to fix windows build error)
Organize macro tests a bit more #143514 (Organize macro tests a bit more)
rustc_builtin_macros: Make sure registered attributes stay sorted #143518 (rustc_builtin_macros: Make sure registered attributes stay sorted)

r? @ghost
@rustbot modify labels: rollup

The `macro` directory contains most of the macro tests, but not all of them; move the remainder into `macro`.

As with the list of builtin macros, use tidy to make sure the list of builtin attributes stays sorted.

Most macro tests use `macro` in the name, making it easy to find and run tests relevant to macros. However, a few use `mbe` instead. Rename those to say `macro`.

Signed-off-by: Jonathan Brouwer <[email protected]>

…ibute, r=jdonszelmann Rewrite empty attribute lint for new attribute parser cc `@jdonszelmann`

…=RalfJung Use `object` crate from crates.io to fix windows build error See https://rust-lang.zulipchat.com/#narrow/channel/386786-rustc-codegen-gcc/topic/Cannot.20compile.20rustc.20on.20Windows.2010/with/527240094

…on, r=jieyouxu Organize macro tests a bit more - Move some macro parsing tests from `tests/ui/parser` to `tests/ui/parser/macro`. - Most macro tests use `macro` in the name, making it easy to find and run tests relevant to macros. However, a few use `mbe` instead. Rename those to say `macro`.

rustc_builtin_macros: Make sure registered attributes stay sorted As with the list of builtin macros, use tidy to make sure the list of builtin attributes stays sorted.

matthiaskrgr · 2025-07-06T13:56:40Z

@bors r+ rollup=never p=5

bors · 2025-07-06T13:56:43Z

📌 Commit bff79a7 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-07-06T16:56:19Z

⌛ Testing commit bff79a7 with merge de031bb...

bors · 2025-07-06T19:57:00Z

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

rust-timer · 2025-07-06T19:58:10Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#143252	Rewrite empty attribute lint for new attribute parser	`6c1641c6c876727ab7a12dcc152df385669b2a6f` (link)
#143492	Use `object` crate from crates.io to fix windows build error	`cf41741a7dd53d2b1b9258800abad1601f8ee01b` (link)
#143514	Organize macro tests a bit more	`9b16047e1a5599aaf1d2cd28d63918f9d7aaf926` (link)
#143518	rustc_builtin_macros: Make sure registered attributes stay …	`2c49adc01d4d2b8d1a9e3e2a1faa13999569ec85` (link)

previous master: 3c95364c4a

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-06T20:00:10Z

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 3c95364 (parent) -> de031bb (this PR)

Test differences

Show 101 test diffs

Stage 1

[ui] tests/ui/async-await/async-fn/macro-async-trait-bound-theoretical-regression.rs: [missing] -> pass (J1)
[ui] tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/break-in-unlabeled-block-in-macro.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/extern-abi-from-mac-literal-frag.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/lit-err-in-macro.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macro-bad-delimiter-ident.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macro-braces-dot-question.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macro-keyword.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macro-mismatched-delim-brace-paren.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macro-mismatched-delim-paren-brace.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macro/break-in-unlabeled-block-in-macro.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/extern-abi-from-mac-literal-frag.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/lit-err-in-macro.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macro-bad-delimiter-ident.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macro-bare-trait-object-maybe-trait-bound.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macro-braces-dot-question.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macro-dotdotdot-may-not-begin-a-type.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macro-keyword.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macro-mismatched-delim-brace-paren.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macro-mismatched-delim-paren-brace.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macro-missing-right-paren.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macros-no-semicolon-items.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/macros-no-semicolon.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/mbe-bare-trait-object-maybe-trait-bound.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macro/mbe-dotdotdot-may-not-begin-a-type.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macro/misspelled-macro-rules.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/pub-method-macro.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/semi-after-closure-in-macro.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macro/trailing-question-in-macro-type.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/macros-no-semicolon-items.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/macros-no-semicolon.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/mbe_missing_right_paren.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/misspelled-macro-rules.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/pub-method-macro.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/semi-after-closure-in-macro.rs: pass -> [missing] (J1)
[ui] tests/ui/parser/trailing-question-in-macro-type.rs: pass -> [missing] (J1)
[ui] tests/ui/traits/const-traits/macro-bare-trait-objects-const-trait-bounds.rs: [missing] -> pass (J1)
[ui] tests/ui/traits/const-traits/macro-const-trait-bound-theoretical-regression.rs: [missing] -> pass (J1)
[ui] tests/ui/traits/const-traits/macro-dyn-const-2015.rs: [missing] -> pass (J1)
[ui] tests/ui/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.rs: pass -> [missing] (J1)
[ui] tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.rs: pass -> [missing] (J1)
[ui] tests/ui/traits/const-traits/mbe-dyn-const-2015.rs: pass -> [missing] (J1)
session_diagnostics::verify_attr_parsing_empty_attribute_35: [missing] -> pass (J2)
session_diagnostics::verify_attr_parsing_invalid_alignment_value_35: pass -> [missing] (J2)
session_diagnostics::verify_attr_parsing_invalid_alignment_value_36: [missing] -> pass (J2)
session_diagnostics::verify_attr_parsing_naked_functions_incompatible_attribute_38: pass -> [missing] (J2)
session_diagnostics::verify_attr_parsing_naked_functions_incompatible_attribute_39: [missing] -> pass (J2)
session_diagnostics::verify_attr_parsing_repr_ident_36: pass -> [missing] (J2)
session_diagnostics::verify_attr_parsing_repr_ident_37: [missing] -> pass (J2)
session_diagnostics::verify_attr_parsing_unrecognized_repr_hint_37: pass -> [missing] (J2)
session_diagnostics::verify_attr_parsing_unrecognized_repr_hint_38: [missing] -> pass (J2)

Stage 2

[ui] tests/ui/async-await/async-fn/macro-async-trait-bound-theoretical-regression.rs: [missing] -> pass (J0)
[ui] tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/break-in-unlabeled-block-in-macro.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/extern-abi-from-mac-literal-frag.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/lit-err-in-macro.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macro-bad-delimiter-ident.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macro-braces-dot-question.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macro-keyword.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macro-mismatched-delim-brace-paren.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macro-mismatched-delim-paren-brace.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macro/break-in-unlabeled-block-in-macro.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/extern-abi-from-mac-literal-frag.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/lit-err-in-macro.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macro-bad-delimiter-ident.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macro-bare-trait-object-maybe-trait-bound.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macro-braces-dot-question.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macro-dotdotdot-may-not-begin-a-type.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macro-keyword.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macro-mismatched-delim-brace-paren.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macro-mismatched-delim-paren-brace.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macro-missing-right-paren.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macros-no-semicolon-items.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/macros-no-semicolon.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/mbe-bare-trait-object-maybe-trait-bound.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macro/mbe-dotdotdot-may-not-begin-a-type.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macro/misspelled-macro-rules.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/pub-method-macro.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/semi-after-closure-in-macro.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macro/trailing-question-in-macro-type.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/macros-no-semicolon-items.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/macros-no-semicolon.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/mbe_missing_right_paren.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/misspelled-macro-rules.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/pub-method-macro.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/semi-after-closure-in-macro.rs: pass -> [missing] (J0)
[ui] tests/ui/parser/trailing-question-in-macro-type.rs: pass -> [missing] (J0)
[ui] tests/ui/traits/const-traits/macro-bare-trait-objects-const-trait-bounds.rs: [missing] -> pass (J0)
[ui] tests/ui/traits/const-traits/macro-const-trait-bound-theoretical-regression.rs: [missing] -> pass (J0)
[ui] tests/ui/traits/const-traits/macro-dyn-const-2015.rs: [missing] -> pass (J0)
[ui] tests/ui/traits/const-traits/mbe-bare-trait-objects-const-trait-bounds.rs: pass -> [missing] (J0)
[ui] tests/ui/traits/const-traits/mbe-const-trait-bound-theoretical-regression.rs: pass -> [missing] (J0)
[ui] tests/ui/traits/const-traits/mbe-dyn-const-2015.rs: pass -> [missing] (J0)

Additionally, 4 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 de031bbcb161b0b7fc0eb16f77b02ce9fbdf4c9e --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-1: 5964.0s -> 8580.8s (43.9%)
x86_64-apple-2: 3319.4s -> 4378.7s (31.9%)
x86_64-rust-for-linux: 2528.3s -> 3077.8s (21.7%)
x86_64-gnu-tools: 3310.3s -> 3953.6s (19.4%)
aarch64-gnu-debug: 3639.9s -> 4226.4s (16.1%)
pr-check-1: 1619.3s -> 1869.9s (15.5%)
i686-gnu-nopt-1: 7134.5s -> 7948.8s (11.4%)
x86_64-gnu-llvm-20-2: 5541.1s -> 6138.2s (10.8%)
i686-gnu-1: 7236.6s -> 7970.6s (10.1%)
test-various: 4612.2s -> 5062.2s (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-07T02:34:27Z

Finished benchmarking commit (de031bb): comparison URL.

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

Max RSS (memory usage)

Results (primary -2.6%, secondary 4.9%)

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.9%	[4.9%, 4.9%]	1
Improvements ✅ (primary)	-2.6%	[-2.6%, -2.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.6%	[-2.6%, -2.6%]	1

Cycles

Results (secondary -3.4%)

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)	-	-	0
Improvements ✅ (secondary)	-3.4%	[-4.4%, -2.7%]	7
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 461.042s -> 460.528s (-0.11%)
Artifact size: 372.12 MiB -> 372.13 MiB (0.00%)

Diggsey and others added 11 commits July 5, 2025 15:58

Use object crate from crates.io to fix windows build error

a839b07

Make tempfile a normal dependency

ea7b756

Move macro tests in parser into macro directory

6d64306

The `macro` directory contains most of the macro tests, but not all of them; move the remainder into `macro`.

rustc_builtin_macros: Make sure registered attributes stay sorted

e99f9c5

As with the list of builtin macros, use tidy to make sure the list of builtin attributes stays sorted.

Rename tests named with mbe to use macro instead

131cffb

Most macro tests use `macro` in the name, making it easy to find and run tests relevant to macros. However, a few use `mbe` instead. Rename those to say `macro`.

Rewrite empty attribute lint

3fa0ec9

Signed-off-by: Jonathan Brouwer <[email protected]>

Fix line break after ":" in unpretty attribute print

33f2cc7

Signed-off-by: Jonathan Brouwer <[email protected]>

Rollup merge of rust-lang#143252 - JonathanBrouwer:rewrite_empty_attr…

017fe2f

…ibute, r=jdonszelmann Rewrite empty attribute lint for new attribute parser cc `@jdonszelmann`

Rollup merge of rust-lang#143518 - joshtriplett:sort-attrs, r=Kobzol

bff79a7

rustc_builtin_macros: Make sure registered attributes stay sorted As with the list of builtin macros, use tidy to make sure the list of builtin attributes stays sorted.

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 de031bb into rust-lang:master Jul 6, 2025
1 check passed

rustbot added this to the 1.90.0 milestone Jul 6, 2025

This was referenced Jul 6, 2025

Distinguish delim kind to decide whether to emit unexpected closing delimiter #138554

Open

Align attr fixes #143206

Merged

Rework c_variadic #141980

Open

bors mentioned this pull request Jul 6, 2025

Port #[cfg] to the new attribute parsing infrastructure #143460

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 4 pull requests #143526

Rollup of 4 pull requests #143526

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

Uh oh!

Uh oh!

Rollup of 4 pull requests #143526

Rollup of 4 pull requests #143526

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

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

matthiaskrgr commented Jul 6, 2025 •

edited by rustbot

Loading