Skip to content

Rollup of 2 pull requests#153139

Merged
rust-bors[bot] merged 5 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-QZ4yuaa
Feb 26, 2026
Merged

Rollup of 2 pull requests#153139
rust-bors[bot] merged 5 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-QZ4yuaa

Conversation

@JonathanBrouwer
Copy link
Contributor

@JonathanBrouwer JonathanBrouwer commented Feb 26, 2026

Successful merges:

r? @ghost

Create a similar rollup

Urgau and others added 5 commits February 24, 2026 20:01
@Urgau
Revert "Also duplicate #[expect] attribute in #[derive]-ed code"
700cb19
@Urgau
Add regression test for lint expectations with expansion and derives
8fefa65
@JonathanBrouwer
Revert "rustc_expand: improve diagnostics for non-repeatable metavars"
fe3b3a4 
This reverts commit 93b9973.
@JonathanBrouwer
Rollup merge of rust-lang#153055 - Urgau:revert-152289, r=jdonszelmann
fd2950b 
 Revert "Also duplicate `#[expect]` attribute in `#[derive]`-ed code"

Turns out rust-lang#152289 doesn't work, not because cloning an attribute doesn't keep the same attribute id, but because `#[cfg]` and `#[cfg_attr]` [re-parse items from scratch](https://github.com/rust-lang/rust/blob/859951e3c7c9d0322c39bad49221937455bdffcd/compiler/rustc_builtin_macros/src/cfg_eval.rs#L100-L109) bypassing any cloning on AST and forcing the creation of new attribute IDs. 😕

Fixes rust-lang#153036
Fixes rust-lang#152401
Reopens rust-lang#150553
@JonathanBrouwer
Rollup merge of rust-lang#153095 - JonathanBrouwer:revert, r=lqd
3e1566d 
Revert "rustc_expand: improve diagnostics for non-repeatable metavars"

Revert because of a perf regression in rust-lang#152679
Clean revert

r? @ghost
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Feb 26, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 26, 2026
@JonathanBrouwer
Copy link
Contributor Author

JonathanBrouwer commented Feb 26, 2026 •
edited
Loading

@bors r+ rollup=never p=10
This rollup contains a revert of a major perf regression
Discussed here #t-infra > Tree ops @ 💬

@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 26, 2026

📌 Commit 3e1566d has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors 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 Feb 26, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors 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 Feb 26, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 26, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 11m 39s
Pushing 25396cf to main...

@rust-bors rust-bors bot merged commit 25396cf into rust-lang:main Feb 26, 2026
12 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Feb 26, 2026
@rust-timer
Copy link
Collaborator

rust-timer commented Feb 26, 2026

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#153055 Revert "Also duplicate #[expect] attribute in `#[derive]… a272d659c8f02059939c7e6b3e2da5fc62241d37 (link)
#153095 Revert "rustc_expand: improve diagnostics for non-repeatabl… 0a9deaef2bf46ac1411a27b427b7ab8e8737d6e2 (link)

previous master: bb779a9156

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
Copy link
Contributor

github-actions bot commented Feb 26, 2026

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 bb779a9 (parent) -> 25396cf (this PR)

Test differences

Show 10 test diffs

Stage 1

  • [ui] tests/ui/lint/rfc-2383-lint-reason/derive-expect-issue-150553-4.rs: [missing] -> pass (J0)
  • [ui] tests/ui/macros/typo-in-norepeat-expr-2.rs: pass -> [missing] (J0)
  • [ui] tests/ui/macros/typo-in-norepeat-expr.rs: pass -> [missing] (J0)

Stage 2

  • [ui] tests/ui/lint/rfc-2383-lint-reason/derive-expect-issue-150553-4.rs: [missing] -> pass (J1)
  • [ui] tests/ui/macros/typo-in-norepeat-expr-2.rs: pass -> [missing] (J1)
  • [ui] tests/ui/macros/typo-in-norepeat-expr.rs: pass -> [missing] (J1)

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 25396cf54981afd1fa5a7406658b45033106a0d3 --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

  1. aarch64-apple: 4h 10m -> 2h 56m (-29.8%)
  2. dist-aarch64-apple: 1h 59m -> 2h 19m (+17.1%)
  3. pr-check-1: 32m 32s -> 27m 21s (-15.9%)
  4. x86_64-rust-for-linux: 52m 54s -> 44m 51s (-15.2%)
  5. dist-x86_64-apple: 2h 9m -> 2h 28m (+14.7%)
  6. pr-check-2: 40m 43s -> 35m 8s (-13.7%)
  7. dist-x86_64-musl: 2h 23m -> 2h 4m (-12.9%)
  8. x86_64-gnu-tools: 1h 4m -> 56m 13s (-12.7%)
  9. aarch64-msvc-2: 1h 36m -> 1h 46m (+10.5%)
  10. dist-riscv64-linux: 1h 23m -> 1h 32m (+10.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
Copy link
Collaborator

rust-timer commented Feb 26, 2026

Finished benchmarking commit (25396cf): comparison URL.

Overall result: ✅ 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
Improvements ✅
(primary)		 -2.0% [-4.8%, -0.2%] 42
Improvements ✅
(secondary)		 -0.9% [-3.2%, -0.2%] 25
All ❌✅ (primary) -2.0% [-4.8%, -0.2%] 42

Max RSS (memory usage)

Results (primary 3.0%)

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

mean range count
Regressions ❌
(primary)		 3.0% [3.0%, 3.0%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 3.0% [3.0%, 3.0%] 1

Cycles

Results (primary -2.8%, secondary -1.3%)

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)		 3.4% [3.4%, 3.4%] 1
Improvements ✅
(primary)		 -2.8% [-4.0%, -2.2%] 9
Improvements ✅
(secondary)		 -2.8% [-4.0%, -2.1%] 3
All ❌✅ (primary) -2.8% [-4.0%, -2.2%] 9

Binary size

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

Bootstrap: 480.119s -> 481.72s (0.33%)
Artifact size: 395.65 MiB -> 395.60 MiB (-0.01%)

@JonathanBrouwer
Copy link
Contributor Author

JonathanBrouwer commented Feb 26, 2026

Gains the perf back from #153095

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.95.0

Development

Successfully merging this pull request may close these issues.

4 participants

@JonathanBrouwer @rust-timer @rustbot @Urgau