Skip to content

Rollup of 6 pull requests#155953

Merged
rust-bors[bot] merged 14 commits intorust-lang:mainfrom
ShoyuVanilla:rollup-BrmB2HL
Apr 29, 2026
Merged

Rollup of 6 pull requests#155953
rust-bors[bot] merged 14 commits intorust-lang:mainfrom
ShoyuVanilla:rollup-BrmB2HL

Conversation

@ShoyuVanilla
Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

kjetilkjeka and others added 14 commits April 28, 2026 08:48
- This field is just a copy of `sess.unstable_opts.assume_incomplete_release`.
- This field has a single use.
- `sess` is also available at that use point

So this commit removes the field and gets the value directly from
`sess`.
`ParseSess` is separate from, but sits within, `Session`. The separation
is because there are some places (e.g. `Parser` methods) where
`ParseSess` is available but `Session` is not.

However, `ParseSess` has four fields that are only accessed from places
where `Session` is also available. This commit moves those fields to
`Session`. This means that `ParseSess` only contains the fields it
genuinely needs, and various `sess.psess.foo` occurrences are reduced to
`sess.foo`.
…_hw_and_isa, r=ZuseZ4

NVPTX: Drop support for old architectures and old ISAs

This is the implementation of [this MCP](rust-lang/compiler-team#965 (comment))

I believe it was said that no FCP was needed, but if that is incorrect then the FCP is anyway scheduled to finish in 2 days so it can in any case be merged then.
…outines, r=lcnr

`-Znext-solver` Propagate `stalled_on_coroutines` as a field in `Certainty::Maybe`

..instead of collecting them with a `ProofTreeVisitor`

Fixes rust-lang/trait-system-refactor-initiative#270
…nathanBrouwer

Shrink `ParseSess`

`ParseSess` contains some unnecessary fields. Details in individual commits.

r? @JonathanBrouwer
delete unused auxiliary test files

Related issue for detecting these properly: rust-lang#133914.
… r=nia-e

fix: ✏️ forgot to change the stable version for `assert_matches!` macro.

The `assert_matches` macro was delayed because of rust-lang#154406 and the `#[stable(since)]` wasn't changed to the next version.
…nce-tests, r=nnethercote

tests: mark simple UI tests as check-pass

This changes 14 simple UI tests from build-pass to check-pass.

These tests cover type checking, trait bounds, closure inference, deprecation diagnostics, dyn compatibility, and variance. They do not need codegen or linking, so check-pass keeps the intended coverage while removing old FIXME(62277) markers.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Apr 29, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Apr 29, 2026
@ShoyuVanilla
Copy link
Copy Markdown
Member Author

@bors r+ p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 29, 2026

📌 Commit 7ffff36 has been approved by ShoyuVanilla

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 29, 2026
@jieyouxu
Copy link
Copy Markdown
Member

jieyouxu commented Apr 29, 2026

Let us know if loongarch job still fails with insufficient disk space in #t-infra > loongarch-musl job running out of disk space.

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

rust-bors Bot commented Apr 29, 2026

☀️ Test successful - CI
Approved by: ShoyuVanilla
Duration: 3h 24m 31s
Pushing 4f9e4e1 to main...

@rust-bors rust-bors Bot merged commit 4f9e4e1 into rust-lang:main Apr 29, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 29, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#152443 NVPTX: Drop support for old architectures and old ISAs 4a9b0a8996869692ada8347997521144c551780b (link)
#155648 -Znext-solver Propagate stalled_on_coroutines as a fiel… 0761dee9699726556aca3a87f450bab5fd35095b (link)
#155896 Shrink ParseSess 55145b2e517b500180ad5ea8fa08479b6d2aedec (link)
#155922 delete unused auxiliary test files 88143c63c1cf1a66ed6ba2174a11df4f4c25b886 (link)
#155943 fix: ✏️ forgot to change the stable version for `assert… f350973bfab10bde7a6d62c7230d66398963540e (link)
#155947 tests: mark simple UI tests as check-pass 76455afff356c492573ae211471d567262ba4b15 (link)

previous master: 37d85e592f

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 37d85e5 (parent) -> 4f9e4e1 (this PR)

Test differences

Show 41 test diffs

Stage 1

  • [ui] tests/ui/target-cpu/unsupported-target-cpu.rs#nvptx-sm60: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/deeply-nested-stalled-on-coroutines.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/traits/next-solver/deeply-nested-stalled-on-coroutines.rs: [missing] -> pass (J1)
  • [ui] tests/ui/target-cpu/unsupported-target-cpu.rs#nvptx-sm60: [missing] -> pass (J2)
  • [ui] tests/ui/target-cpu/unsupported-target-cpu.rs#nvptx-sm60: [missing] -> ignore (gcc backend is marked as ignore) (J3)

Additionally, 36 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 4f9e4e1aa6a9e97f9c96dec4b3ecebccfabd31e5 --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. i686-gnu-nopt-1: 1h 39m -> 2h 19m (+39.8%)
  2. dist-aarch64-apple: 2h 24m -> 1h 45m (-26.8%)
  3. dist-armhf-linux: 1h 9m -> 1h 27m (+25.8%)
  4. x86_64-gnu-tools: 51m 22s -> 1h 1m (+19.6%)
  5. x86_64-gnu-llvm-22-2: 1h 35m -> 1h 17m (-18.6%)
  6. dist-x86_64-apple: 2h 27m -> 2h 1m (-18.1%)
  7. dist-various-2: 42m 35s -> 34m 53s (-18.1%)
  8. pr-check-1: 28m 2s -> 33m 6s (+18.0%)
  9. armhf-gnu: 1h 24m -> 1h 12m (-13.9%)
  10. dist-x86_64-netbsd: 1h 11m -> 1h 20m (+12.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
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (4f9e4e1): comparison URL.

Overall result: ❌✅ regressions and improvements - please read:

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
Regressions ❌
(secondary)
0.0% [0.0%, 0.1%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.2% [-0.6%, -0.0%] 5
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -3.1%, secondary 1.6%)

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.3% [2.2%, 4.4%] 2
Improvements ✅
(primary)
-3.1% [-4.4%, -2.0%] 4
Improvements ✅
(secondary)
-1.8% [-1.8%, -1.8%] 1
All ❌✅ (primary) -3.1% [-4.4%, -2.0%] 4

Cycles

Results (secondary -1.5%)

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.3% [2.6%, 4.2%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.2% [-5.1%, -1.6%] 11
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 486.76s -> 486.853s (0.02%)
Artifact size: 393.43 MiB -> 395.46 MiB (0.51%)

@rustbot rustbot added the perf-regression Performance regression. label Apr 29, 2026
@ShoyuVanilla ShoyuVanilla deleted the rollup-BrmB2HL branch April 29, 2026 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants