Skip to content

Rollup of 2 pull requests#154842

Merged
rust-bors[bot] merged 6 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-nuHAPsT
Apr 5, 2026
Merged

Rollup of 2 pull requests#154842
rust-bors[bot] merged 6 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-nuHAPsT

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

Enselic and others added 6 commits April 1, 2026 12:12
The `user_arg_index` nomenclature can be applied more broadly, but then
the diff becomes annoyingly big, so I chose not to do that.
So that the impact of the commit that fixes the test can be seen
clearly.
When there is a lifetime error, the code does its best to find variables
that correspond to the lifetimes involved. This commit stops mentioning
arguments that are unused in closures, since they are not relevant.

See the diff of the blessed test to get a good clue of what that means.
…lubby789,jieyouxu

Make sure we run the full suite, even when more specific filters are given

Some test suite's filter code took this into account, while others didn't.
Imagine this:

```
x test tests/ui/sometest.rs tests/ui
```

This would run only `tests/ui/sometest.rs` since we filtered out `tests/ui` since it matches the name of the test suite.
The reason `x test tests/ui` on its own works, is that if compiletest gets no filter paths, only a suite, it runs the entire suite.
What I've implemented here is that when you pass the suite path, we effectively ignore specific filters and just run the entire suite since that'll include the more specific paths too. This was the case for a few other suites as well, like rustdocjs, but others actually handle this correctly (like clippy, which my code does edit but for which the behavior doesn't change).

Hope this makes sense!
…mann

borrowck: Don't mention unused vars in closure outlive errors

When there is a closure arg lifetime error, the code does its best to find variables that correspond to the lifetimes involved. This commit stops mentioning arguments that are unused in closures, since they are not relevant. This removes the "red herring" of rust-lang#113121.

The `user_arg_index` nomenclature can be applied more broadly, but then the diff becomes annoyingly big, so I chose not to do that.

Review each commit individually for a nicer experience.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Apr 5, 2026
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 5, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 5, 2026

📌 Commit 9b2b299 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 5, 2026
@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 5, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 5, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 7m
Pushing 9602bda to main...

@rust-bors rust-bors Bot merged commit 9602bda into rust-lang:main Apr 5, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Apr 5, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154555 Make sure we run the full suite, even when more specific fi… 06fef904252c98bf3c2290bcc014188ba9b86886 (link)
#154674 borrowck: Don't mention unused vars in closure outlive erro… 4ad1a4ec93413ff8435a86d5a9ecc0c1be574db7 (link)

previous master: e73c56abd0

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

github-actions Bot commented Apr 5, 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 e73c56a (parent) -> 9602bda (this PR)

Test differences

Show 2 test diffs

Stage 1

  • [ui] tests/ui/borrowck/var-matching-lifetime-but-unused-not-mentioned.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/borrowck/var-matching-lifetime-but-unused-not-mentioned.rs: [missing] -> pass (J1)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 9602bda1dd0c1bbf5787e398385bbac81fd532f8 --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. dist-aarch64-msvc: 1h 34m -> 1h 53m (+20.1%)
  2. x86_64-gnu-llvm-21-1: 1h 14m -> 1h 2m (-15.6%)
  3. aarch64-apple: 2h 49m -> 2h 23m (-15.2%)
  4. optional-x86_64-gnu-parallel-frontend: 2h 34m -> 2h 12m (-14.2%)
  5. pr-check-1: 31m 53s -> 27m 23s (-14.1%)
  6. x86_64-rust-for-linux: 52m 33s -> 46m 11s (-12.1%)
  7. dist-x86_64-apple: 1h 38m -> 1h 49m (+11.9%)
  8. aarch64-gnu-debug: 1h 17m -> 1h 9m (-10.6%)
  9. x86_64-msvc-ext2: 1h 43m -> 1h 54m (+10.3%)
  10. i686-gnu-2: 1h 40m -> 1h 30m (-10.1%)
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 (9602bda): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (secondary 3.1%)

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

Cycles

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

Binary size

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

Bootstrap: 493.268s -> 485.742s (-1.53%)
Artifact size: 395.03 MiB -> 395.04 MiB (0.00%)

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

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc 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.

5 participants