Skip to content

Rollup of 5 pull requests#155483

Merged
rust-bors[bot] merged 12 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-9T12Udy
Apr 18, 2026
Merged

Rollup of 5 pull requests#155483
rust-bors[bot] merged 12 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-9T12Udy

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

DanielEScherzer and others added 12 commits April 13, 2026 14:52
…Lint`.

The end goal being to completely remove `AttributeLint`.
…jdonszelmann

Make `OnDuplicate::Error` the default for attributes

This makes two changes, in separate commits for reviewability:
- Changes all unstable attributes that are currently `OnDuplicate::Warn` to error.
- Makes `OnDuplicate::Error` the default and removes the explicit `ON_DUPLICATE` for ones that currently already error

r? @jdonszelmann
…t, r=JonathanBrouwer

Set up API to make it possible to pass closures instead of `AttributeLint`

Part of rust-lang#153099.

This PR sets up the base implementations needed to remove `AttributeLintKind` entirely and migrate two variants as examples.

r? @JonathanBrouwer
…-help, r=mati865

  Fix conflicting deref move suggestion for LazyLock patterns

fixes rust-lang#154826.

Rust was suggesting *V -> V for let (v,) = *V, which then triggered a follow-up error suggesting the opposite. This patch makes that case suggest borrowing (&*V) instead. Also handles destructuring assignment separately so we don’t emit a misleading &*... fix-it there.
…e-the, r=Zalathar

bootstrap.py: fix duplicated "the"
…-doc-broken-link, r=mati865

Fixed broken documentation link for method lookup in rustc_hir_typeck…
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Apr 18, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 18, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-2

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 18, 2026

📌 Commit 963d61f 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 Apr 18, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Apr 18, 2026
Rollup of 5 pull requests


try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-2
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 18, 2026

☀️ Try build successful (CI)
Build commit: a91f50e (a91f50e24ef8dff5bccd238d0d2fa7c5f19c1581, parent: 7a38981b365e4c3672053b910fce9a14c6555ab9)

@rust-bors

This comment has been minimized.

@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 Apr 18, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 18, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 5m 54s
Pushing 3142bea to main...

@rust-bors rust-bors Bot merged commit 3142bea into rust-lang:main Apr 18, 2026
13 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 18, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154432 Set up API to make it possible to pass closures instead of … 4927b9f457a27fee7d100ad6f0356b43354b83c2 (link)
#154843 Fix conflicting deref move suggestion for LazyLock patter… 75445780bd12d5af8f3f293b3bbf16219e44e2a8 (link)
#155262 bootstrap.py: fix duplicated "the" 6a8f74ef6a8794ed18a13f885f8af83b8421e4e9 (link)
#155308 Make OnDuplicate::Error the default for attributes ff4d620873b940ca18880cdb06d04e0006826931 (link)
#155478 Fixed broken documentation link for method lookup in rustc_… 7294a85f181a946130b6fa84e051828266d1893a (link)

previous master: 8da2d28cbd

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

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 8da2d28 (parent) -> 3142bea (this PR)

Test differences

Show 26 test diffs

Stage 1

  • [ui] tests/ui/suggestions/borrow-from-overloaded-deref-assign-issue-154826.rs: [missing] -> pass (J0)
  • [ui] tests/ui/suggestions/borrow-from-overloaded-deref-issue-154826.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/suggestions/borrow-from-overloaded-deref-assign-issue-154826.rs: [missing] -> pass (J1)
  • [ui] tests/ui/suggestions/borrow-from-overloaded-deref-issue-154826.rs: [missing] -> pass (J1)

Additionally, 22 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 3142beae24ddd6b7fd68e49e227bebf79181f9e4 --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. x86_64-gnu-stable: 1h 45m -> 2h 26m (+38.4%)
  2. x86_64-msvc-ext2: 1h 58m -> 1h 22m (-30.1%)
  3. pr-check-1: 26m 16s -> 33m 50s (+28.8%)
  4. x86_64-mingw-1: 2h 12m -> 2h 50m (+28.2%)
  5. x86_64-rust-for-linux: 43m 17s -> 54m 57s (+26.9%)
  6. x86_64-mingw-2: 2h 6m -> 2h 38m (+26.0%)
  7. x86_64-gnu-llvm-21-3: 1h 53m -> 1h 25m (-25.1%)
  8. dist-powerpc-linux: 1h 30m -> 1h 12m (-20.3%)
  9. i686-gnu-nopt-1: 1h 56m -> 2h 20m (+20.3%)
  10. dist-x86_64-llvm-mingw: 1h 50m -> 1h 29m (-19.2%)
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
Copy Markdown
Collaborator

Finished benchmarking commit (3142bea): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary 1.9%)

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

mean range count
Regressions ❌
(primary)
6.3% [6.3%, 6.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.9% [-2.5%, 6.3%] 2

Cycles

Results (secondary 17.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)
17.9% [15.0%, 20.8%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 493.313s -> 492.552s (-0.15%)
Artifact size: 394.36 MiB -> 394.41 MiB (0.01%)

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

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants