Skip to content

Rollup of 5 pull requests#157433

Merged
rust-bors[bot] merged 67 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-d3I87zR
Jun 4, 2026
Merged

Rollup of 5 pull requests#157433
rust-bors[bot] merged 67 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-d3I87zR

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

xonx4l and others added 30 commits January 21, 2026 13:07
fix -s to -S in llvm tooling instructiongs
…0505-stage

Fix name of first compiled stage, as stage0 is downloaded
Replace `rustc_session::parse::feature*` with ``rustc_session::errors::feature*`
Update dependencies to remove windows-targets dependency
autodiff: reference rustup installation support
This updates the rust-version file to a31c27a.
Fix sample code for std::offload at usage.md
Clarify importance of `target-cpu` flag for offload
Added note about stage2 dependency in rustup toolchain linking.
Added a note about building tools and linked to tool tests section.
Add note on building tools in how-to-build-and-run.md
Add docs for non defining vs defining uses in opaque types
Co-authored-by: jyn <github@jyn.dev>
Update quickstart.md with stage2 note
aerooneqq and others added 10 commits June 4, 2026 15:07
…y789,jieyouxu

Record failed tests with `--record`, and rerun them with `--rerun`

This adds two parameters to `x test`:

## `--record`

Writes a file, by default `build/failed-tests`, but this can be overwritten with
```toml
[build]
record_failed_tests_path = "somepath"
```
with a list of all tests that fail that run.

## `--rerun`

Looks for the failed-tests file, parse it, and attempt to rerun only those tests. No cli-arguments are necessary, i.e.
```
x test tests/ui --record
x test --rerun
```

Will run all failed uitests. No need to pass tests/ui to the rerun invocation.

The last commit is a little awkward, but I think it's the best way to make it so that we *first* run all tests that have to be rerun, and *then* rerun tests passed through the cli.

This makes it so:
```
x test tests/ui --rerun
```
will *first* rerun failed tests, some of which may be uitests, if any fail it quits and reports failed tests, but if all pass it will run all normally passed tests. In other words, only if all previously-failed tests pass on the rerun, we then also run uitests.
Without the last commit, this would instead just run all uitests, since the failed tests form a subset of all uitests. I think that's less useful.
…ve, r=petrochenkov

delegation: split resolution and lowering

This PR splits delegation's AST -> HIR lowering and its resolution. Now we resolve all delegations and then lower them. This should have benefits:

- ~For rust-lang#156798, where it will be convenient to insert diagnostics about specifying target expressions for glob reuses of only static functions (the `delegations_resolutions` map will contain information whether to lower or delete target expression)~
- For rust-lang#155337 and delegations to inherent methods resolution, as from what I tested up until now we should resolve them in iterative manner before AST -> HIR lowering.

Part of rust-lang#118212.
r? @petrochenkov
…llot

Fix a coroutine UI test which is missing `#[coroutine]`

This looks like a typo, although the test now produces a different error to the other errors in the file.

I also fixed some comment typos in tests, happy to drop that commit if you don't want to review it.
…u32, r=nikic

tests: codegen-llvm: Update bpf-alu32 with the new LLVM attributes

The LLVM backend now emits `noundef zeroext` on `i8` return values and `noundef` on `i8` parameters. Update the FileCheck pattern to match.

r? @nagisa
rustc-dev-guide subtree update

Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@e99720b.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 4, 2026
@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide 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 Jun 4, 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 Jun 4, 2026

📌 Commit 798684a 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 Jun 4, 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 Jun 4, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Jun 4, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 19m 12s
Pushing b3f7e32 to main...

@rust-bors rust-bors Bot merged commit b3f7e32 into rust-lang:main Jun 4, 2026
13 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 4, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154586 Record failed tests with --record, and rerun them with `-… d68e178610068f27d43be17765f820774aa4cfbb (link)
#156171 Fix a coroutine UI test which is missing #[coroutine] 6fce9b3ddb035a564324cab3b00299af979fdad8 (link)
#157249 tests: codegen-llvm: Update bpf-alu32 with the new LLVM att… 821c6d868bd44ee50ead05ad45c636d05f3fe5fb (link)
#157296 delegation: split resolution and lowering 5d52d85fa992ee42a71334ebdbb2fbeed248ee24 (link)
#157426 rustc-dev-guide subtree update 918bed642909ee11d66b455dab29cf9fe278cc3e (link)

previous master: 9ae765da47

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 Jun 4, 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 9ae765d (parent) -> b3f7e32 (this PR)

Test differences

Show 68 test diffs

Stage 1

  • [codegen] tests/codegen-llvm/bpf-alu32.rs: ignore (only executed when the architecture is bpf) -> pass (J1)

Stage 2

  • [codegen] tests/codegen-llvm/bpf-alu32.rs: ignore (only executed when the architecture is bpf) -> pass (J0)

Additionally, 66 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 b3f7e3204640c7458c9f5096f3e9c5ad9971a51c --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-gcc-core-tests: 9m 52s -> 14m 36s (+47.8%)
  2. x86_64-msvc-ext1: 1h 42m -> 2h 18m (+34.7%)
  3. dist-x86_64-illumos: 1h 24m -> 1h 51m (+32.3%)
  4. x86_64-gnu-aux: 1h 48m -> 2h 18m (+27.9%)
  5. x86_64-gnu-llvm-21-1: 43m 19s -> 54m 54s (+26.7%)
  6. x86_64-gnu-nopt: 2h 31m -> 1h 52m (-25.9%)
  7. dist-i686-mingw: 2h 6m -> 2h 37m (+24.8%)
  8. dist-x86_64-apple: 2h 8m -> 2h 38m (+22.7%)
  9. dist-x86_64-mingw: 2h 3m -> 2h 30m (+21.8%)
  10. dist-powerpc64-linux-musl: 1h 16m -> 1h 32m (+21.6%)
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.

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

Labels

A-rustc-dev-guide Area: rustc-dev-guide 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.