Skip to content

Rollup of 4 pull requests#156072

Merged
rust-bors[bot] merged 12 commits intorust-lang:mainfrom
GuillaumeGomez:rollup-9U8oPPe
May 2, 2026
Merged

Rollup of 4 pull requests#156072
rust-bors[bot] merged 12 commits intorust-lang:mainfrom
GuillaumeGomez:rollup-9U8oPPe

Conversation

@GuillaumeGomez
Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

chenyukang and others added 12 commits March 30, 2026 11:40
Co-authored-by: 许杰友 Jieyou Xu (Joe) <[email protected]>
rust-lang#150129 reworked this field to use `bool` instead of `usize`, which is awesome!
But the field's comment has a leftover note in it which is no longer true, and that needs to be removed.
…r=clubby789

Fix alias path for rustdoc

I ran this command:

```console
x build --stage 1  --skip rustdoc
Building bootstrap
   Compiling bootstrap v0.0.0 (/Users/yukang/rust/src/bootstrap)
    Finished `dev` profile [unoptimized] target(s) in 1.08s
/Users/yukang/rust/build/aarch64-apple-darwin/ci-llvm/bin/llvm-strip does not exist; skipping copy
Building stage1 compiler artifacts (stage0 -> stage1, aarch64-apple-darwin)
    Finished `release` profile [optimized + debuginfo] target(s) in 0.45s
Creating a sysroot for stage1 compiler (use `rustup toolchain link 'name' build/host/stage1`)
Building stage1 library artifacts{alloc, compiler_builtins, core, panic_abort, panic_unwind, proc_macro, rustc-std-workspace-core, std, std_detect, sysroot, test, unwind} (stage1 -> stage1, aarch64-apple-darwin)
    Finished `dist` profile [optimized + debuginfo] target(s) in 0.10s
Skipping Set({build::src/tools/rustdoc}) because it is excluded
Building stage1 rustdoc_tool_binary (stage0 -> stage1, aarch64-apple-darwin)
    Finished `release` profile [optimized + debuginfo] target(s) in 0.19s
```

expect all `rustdoc` related compiling phase will be exlcuded, but from the log we can see `rustdoc_tool_binary` is still compiled.

`src/tools/rustdoc` and `src/librustdoc` are documented as aliases in path set here:
https://github.com/rust-lang/rust/blob/a25435bcf7cfc9b953d356eda3a51db8da9e3386/src/bootstrap/src/core/builder/mod.rs#L355-L360

we can also see here two paths are treated as alias:
https://github.com/rust-lang/rust/blob/a25435bcf7cfc9b953d356eda3a51db8da9e3386/src/bootstrap/src/core/build_steps/check.rs#L818-L822

but bootstrap registered them as two different sets with `.path(..).path(...)`:
https://github.com/rust-lang/rust/blob/a25435bcf7cfc9b953d356eda3a51db8da9e3386/src/bootstrap/src/core/build_steps/tool.rs#L691-L693

That meant commands like `x build --skip rustdoc`, `--skip src/tools/rustdoc`, or `--skip src/librustdoc` only excluded one side.
`-Znext-solver` Ignore region constraints from the nested goals in leakcheck

Fixes rust-lang/trait-system-refactor-initiative#251
Fixes rust-lang#140577
Fixes rust-lang#153596
…pratt

`bufreader::Buffer`: Remove leftover note about `initialized` field

Just a boring little doc fix! : v)

rust-lang#150129 reworked the `initialized` field to be a `bool` instead of a `usize`.
And then rust-lang#155314 reworked this field's comment (among other things).
But, there's still a leftover note in the comment, which no longer makes sense:
``Note that while this often the same as `filled`, it doesn't need to be.``
This is referencing that back when `initialized` was a `usize`, it was common for it to have the same value as `filled`.

----

Fun fact: there's a typo in the note too! It's missing an "is" before or after "often".
…r=joshtriplett

Map `WSAESHUTDOWN` to `io::ErrorKind::BrokenPipe`

As discussed in [#t-libs > WSAESHUTDOWN error on Windows](https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/WSAESHUTDOWN.20error.20on.20Windows/with/591883531), this adds the mapping for `WSAESHUTDOWN` on Windows to `io::ErrorKind::BrokenPipe`.

r? RalfJung
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 2, 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. 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 May 2, 2026
@GuillaumeGomez
Copy link
Copy Markdown
Member Author

@bors r+ p=4 rollup=never

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 2, 2026

📌 Commit 50805a9 has been approved by GuillaumeGomez

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

rust-bors Bot commented May 2, 2026

☀️ Test successful - CI
Approved by: GuillaumeGomez
Duration: 3h 11m 43s
Pushing 39ef8aa to main...

@rust-bors rust-bors Bot merged commit 39ef8aa into rust-lang:main May 2, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 2, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#154571 Fix alias path for rustdoc 0cdad0526693325be1a21d70c835225684845f1d (link)
#155749 -Znext-solver Ignore region constraints from the nested g… ddc57d2c65e9984ebb43a5366655377021cedfd1 (link)
#156026 bufreader::Buffer: Remove leftover note about `initialize… 417fbce0a6e685a1eb5bd44b246d9a3b309fc841 (link)
#156063 Map WSAESHUTDOWN to io::ErrorKind::BrokenPipe 9a1a8789131159555ef7ff54fc235c42fdea4882 (link)

previous master: 67bcaa9c4b

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 May 2, 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 67bcaa9 (parent) -> 39ef8aa (this PR)

Test differences

Show 23 test diffs

Stage 0

  • core::builder::tests::snapshot::test_exclude_rustdoc_aliases: [missing] -> pass (J3)

Stage 1

  • [crashes] tests/crashes/140577.rs: pass -> [missing] (J0)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-1.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-1.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-2.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-2.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-3.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-3.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/traits/vtable/lack-of-implied-bounds-for-opaque-types-unsound.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/traits/vtable/lack-of-implied-bounds-for-opaque-types-unsound.rs#next: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-1.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-1.rs#next: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-2.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-2.rs#next: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-3.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/non-wf-candidate-behind-stalled-coroutine-3.rs#next: [missing] -> pass (J1)
  • [ui] tests/ui/traits/vtable/lack-of-implied-bounds-for-opaque-types-unsound.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/traits/vtable/lack-of-implied-bounds-for-opaque-types-unsound.rs#next: [missing] -> pass (J1)
  • [crashes] tests/crashes/140577.rs: pass -> [missing] (J2)

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 39ef8aa1d516dbee0a4c1655aa9ce2cd539ea399 --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-msvc-ext1: 1h 40m -> 2h 25m (+44.7%)
  2. x86_64-gnu-llvm-21-3: 2h -> 1h 33m (-22.3%)
  3. dist-powerpc-linux: 1h 29m -> 1h 11m (-19.3%)
  4. dist-powerpc64le-linux-gnu: 1h 18m -> 1h 33m (+19.1%)
  5. dist-powerpc64-linux-musl: 1h 31m -> 1h 14m (-18.7%)
  6. dist-loongarch64-musl: 1h 46m -> 1h 27m (-18.1%)
  7. dist-armv7-linux: 1h 50m -> 1h 31m (-17.5%)
  8. dist-various-2: 44m 39s -> 37m 6s (-16.9%)
  9. aarch64-apple: 3h 10m -> 2h 44m (-14.1%)
  10. aarch64-gnu-debug: 1h 23m -> 1h 12m (-13.0%)
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 (39ef8aa): 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 2.7%, secondary 0.3%)

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

mean range count
Regressions ❌
(primary)
2.7% [2.7%, 2.7%] 1
Regressions ❌
(secondary)
0.6% [0.5%, 0.7%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.4% [-0.4%, -0.4%] 1
All ❌✅ (primary) 2.7% [2.7%, 2.7%] 1

Cycles

Results (secondary 0.2%)

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)
4.6% [2.8%, 6.4%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.2% [-3.2%, -0.5%] 6
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 487.864s -> 482.338s (-1.13%)
Artifact size: 390.99 MiB -> 390.98 MiB (-0.00%)

@GuillaumeGomez GuillaumeGomez deleted the rollup-9U8oPPe branch May 2, 2026 11:22
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. 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.

8 participants