Skip to content

Rollup of 7 pull requests - #161849

Merged
rust-bors[bot] merged 19 commits into
rust-lang:mainfrom
jhpratt:rollup-QMTkuLl
Aug 27, 2026
Merged

Rollup of 7 pull requests#161849
rust-bors[bot] merged 19 commits into
rust-lang:mainfrom
jhpratt:rollup-QMTkuLl

Conversation

@jhpratt

@jhpratt jhpratt commented Aug 27, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

Kobzol and others added 19 commits August 24, 2026 19:23
To slightly speed up bootstrap.
It was just calling `--print sysroot` on the initial rustc, which we do during build initialization anyway.
To use consistent "external binary" nomenclature.
This check is called from a few different places when coverage is enabled, so
we should probably let the query system take care of memoizing results and
tracking dependencies.
```
warning: explicit `package.readme` can be inferred
  --> compiler/rustc_thread_pool/Cargo.toml:11:1
   |
11 | readme = "README.md"
   | ^^^^^^^^^^^^^^^^^^^^
   |
   = note: `cargo::manual_readme` is set to `warn` by default
help: consider removing `package.readme`
warning: `rustc_thread_pool` (manifest) generated 1 warning
```

See
<https://triage.rust-lang.org/gha-logs/rust-lang/rust/98030530980#L2026-08-26T03:05:00.5401170Z-L2026-08-26T03:05:00.5402963Z>
```
warning: unused dependency `unified-diff`
  --> src/tools/compiletest/Cargo.toml:37:1
   |
37 | unified-diff = "0.2.1"
   | ^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `cargo::unused_dependencies` is set to `warn` by default
help: consider removing the dependency on `unified-diff`
warning: `compiletest` (manifest) generated 1 warning
```

See
<https://triage.rust-lang.org/gha-logs/rust-lang/rust/98030530980#L2026-08-26T03:05:07.8912904Z-L2026-08-26T03:05:07.8915112Z>
```
warning: binary `rustdoc_tool_binary` should have a kebab-case name
   |
 1 | /checkout/obj/build/x86_64-unknown-linux-gnu/bootstrap-tools/.../rustdoc_tool_binary
   |                                                                  ^^^^^^^^^^^^^^^^^^^
   |
   = note: `cargo::non_kebab_case_bins` is set to `warn` by default
help: to change the binary name to `rustdoc-tool-binary`, convert `bin.name`
  --> src/tools/rustdoc/Cargo.toml:10:8
   |
10 - name = "rustdoc_tool_binary"
10 + name = "rustdoc-tool-binary"
   |
warning: `rustdoc-tool` (manifest) generated 1 warning
```

See
<https://triage.rust-lang.org/gha-logs/rust-lang/rust/98030530980#L2026-08-26T03:05:00.5389265Z-L2026-08-26T03:05:00.5392627Z>
Add SVE-accelerated Vec::retain_mut for aarch64

The PR adds SVE support for specified width types(8, 16, 32 and 64 bits) in `Vec::retain_mut`. Due to [pointer provenance being stripped by intrinsics](https://rust-lang.zulipchat.com/#narrow/channel/208962-t-libs.2Fstdarch/topic/MaybeUninit.20lane.20variants.20for.20vector.20data-movement.20intrinsic/with/615526760)) here it has to use inline asm instead of sve intrinsics.

## 1. retain half (ns/iter)

| Elements | u32 SVE | u32 scalar | Change | u64 SVE | u64 scalar | Change |
|---|---|---|---|---|---|---|
| 4 | 10.32 | 12.36 | / | 10.25 | 11.83 | / |
| 8 | 12.93 | 15.08 | / | 13.40 | 14.74 | / |
| 16 | 18.66 | 19.46 | / | 19.08 | 18.89 | / |
| 32 | 31.84 | 31.12 |/ | 31.78 | 31.26 | / |
| 64 | 32.99 | 59.17 | **-44.2%** | 59.86 | 59.44 | / |
| 1,000 | 471.51 | 811.71 | **-41.9%** | 820.98 | 827.16 | / |
| 10,000 | 4,660 | 7,990 | **-41.7%** | 5,836 | 8,242 | **-29.2%** |
| 100,000 | 46,414 | 79,608 | **-41.7%** | 57,561 | 82,861 | **-30.5%** |

## 2. retain whole

| Elements | u32 SVE | u32 scalar | Change | u64 SVE | u64 scalar | Change |
|---|---|---|---|---|---|---|
| 4 | 3.46 | 3.11 | / | 3.45 | 3.45 | / |
| 8 | 4.90 | 4.49 | / | 4.83 | 6.22 | / |
| 16 | 8.44 | 8.14 | / | 8.44 | 11.74 | / |
| 32 | 15.83 | 15.51 | / | 15.83 | 22.79 | / |
| 64 | 21.57 | 30.66 | **-29.6%** | 30.72 | 44.89 | / |
| 1,000 | 358.53 | 483.33 | **-25.8%** | 469.18 | 696.43 | / |
| 10,000 | 3,127 | 4,745 | **-34.1%** | 5,082 | 6,912 | **-26.5%** |
| 100,000 | 32,509 | 49,501 | **-34.3%** | 49,484 | 79,749 | **-38.0%** |

r? @Amanieu
…ethlin

interpret: ensure that calls via no-unwind ABIs do not unwind

According to our [ABI docs](https://doc.rust-lang.org/nightly/std/primitive.fn.html#abi-compatibility), programs like this are okay:
```rust
extern "C-unwind" fn does_not_unwind_but_could() {}

fn main() {
    let f: extern "C-unwind" fn() = does_not_unwind_but_could;
    let f: extern "C" fn() = unsafe { std::mem::transmute(f) };
    f();
}
```
So let's add a test for that.

And also, let's adjust the checks in Miri's shims accordingly (see `src/tools/miri/src/shims/sig.rs`). We used to reject calls to functions that *might* unwind with a signature that does not allow unwinding, even if no unwinding occurred. I don't think we have an actual example of a potentially-unwinding shim with an ABI that has a compatible ABI that does not allow unwinding ("C-unwind" and "C"), so we can't add a test for this.
…_aliases, r=adwinwhite

borrowck: Normalize non-rigid aliases in NLL type relating

Fixes rust-lang#160652

With `-Znext-solver=globally`, yielding from an `impl Iterator` without an explicit `Item` bound ICEs in borrowck. The coroutine defining type returned by `type_of` is unnormalized, so its yield type remains `<impl Iterator as Iterator>::Item`. Skipping normalization propagates that non-rigid alias into both MIR's `CoroutineInfo` and borrowck's `UniversalRegions`; NLL type relating then hits its invariant that non-rigid aliases must already have been normalized.

Deeply normalize the instantiated defining type when MIR construction creates `CoroutineInfo` and when borrowck reconstructs `DefiningTy`. That makes the coroutine yield and resume types rigid before NLL compares them.

This is intentionally gated to the next solver. The old solver keeps the existing skip-normalization path because deeply normalizing defining types there causes regressions.
…r=jieyouxu

Assorted bootstrap config refactors (part 1/N)

Related to my current LLVM refactoring in bootstrap, and some of it was unblocked by it.

The goal is to remove as much command execution and I/O (mainly network I/O) from config parsing, and turn the "impure derived computation" part to `Session` instead. Eventually this will require restructuring `download-ci-rustc`.

As a side note, combining `--print sysroot` and `--print target-libdir`, plus one other cleanup, made cache-primed `./x build compiler` ~40ms faster for me locally.

The first commit removed duplicated fields between `Session` and `Config`. It cheats a bit, I implemented `Deref` to get from `Session` to `Config`, to avoid having to update 100+ use sites across bootstrap. But I think it's fine, because it is read only, and adding `.config` everywhere doesn't really add much.

CC @Zalathar

r? jieyouxu
…ouwer

Change `is_eligible_for_coverage` from a hook to a query

- Inspired by seeing rust-lang#161808 add more eligibility conditions
---

This check is called from a few different places when coverage is enabled, so we should probably let the query system take care of memoizing results and tracking dependencies.

(It was made a hook in rust-lang#122322, but I didn't have strong reasons for making it a hook and not a query, other than it being relatively small and simple.)

There should be no user-visible change to compiler behaviour.
chore: fix cargo lints

Fixes two cargo lint erros found during <rust-lang#161789 (comment)>.

See each commit message respectively for details.
…ieyouxu

rustdoc: fix lint `cargo::non_kebab_case_bins`

```
warning: binary `rustdoc_tool_binary` should have a kebab-case name
   |
 1 | /checkout/obj/build/x86_64-unknown-linux-gnu/bootstrap-tools/.../rustdoc_tool_binary
   |                                                                  ^^^^^^^^^^^^^^^^^^^
   |
   = note: `cargo::non_kebab_case_bins` is set to `warn` by default
help: to change the binary name to `rustdoc-tool-binary`, convert `bin.name`
  --> src/tools/rustdoc/Cargo.toml:10:8
   |
10 - name = "rustdoc_tool_binary"
10 + name = "rustdoc-tool-binary"
   |
warning: `rustdoc-tool` (manifest) generated 1 warning
```

See
<https://triage.rust-lang.org/gha-logs/rust-lang/rust/98030530980#L2026-08-26T03:05:00.5389265Z-L2026-08-26T03:05:00.5392627Z>

This was found in <rust-lang#161789>.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 27, 2026
@rustbot rustbot added A-compiletest Area: The compiletest test runner 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Aug 27, 2026
@jhpratt

jhpratt commented Aug 27, 2026

Copy link
Copy Markdown
Member Author

@bors r+ p=5

@rust-bors

rust-bors Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 1be27eb has been approved by jhpratt

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 Aug 27, 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 Aug 27, 2026
@rust-bors

rust-bors Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 1m 49s
Pushing e457a7b to main...

@rust-bors
rust-bors Bot merged commit e457a7b into rust-lang:main Aug 27, 2026
14 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Aug 27, 2026
@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 d9dd070 (parent) -> e457a7b (this PR)

Test differences

Show 795 test diffs

Stage 1

  • vec::bench_retain_iter_u32_000032: [missing] -> pass (J0)
  • vec::bench_retain_iter_u32_000256: [missing] -> pass (J0)
  • vec::bench_retain_u16_000004: [missing] -> pass (J0)
  • vec::bench_retain_u16_000008: [missing] -> pass (J0)
  • vec::bench_retain_u16_000016: [missing] -> pass (J0)
  • vec::bench_retain_u16_000032: [missing] -> pass (J0)
  • vec::bench_retain_u16_000128: [missing] -> pass (J0)
  • vec::bench_retain_u16_000256: [missing] -> pass (J0)
  • vec::bench_retain_u16_001000: [missing] -> pass (J0)
  • vec::bench_retain_u32_000008: [missing] -> pass (J0)
  • vec::bench_retain_u32_000016: [missing] -> pass (J0)
  • vec::bench_retain_u32_000064: [missing] -> pass (J0)
  • vec::bench_retain_u32_000128: [missing] -> pass (J0)
  • vec::bench_retain_u32_000256: [missing] -> pass (J0)
  • vec::bench_retain_u32_000512: [missing] -> pass (J0)
  • vec::bench_retain_u32_001000: [missing] -> pass (J0)
  • vec::bench_retain_u32_010000: [missing] -> pass (J0)
  • vec::bench_retain_u32_100000: [missing] -> pass (J0)
  • vec::bench_retain_u64_000016: [missing] -> pass (J0)
  • vec::bench_retain_u64_000032: [missing] -> pass (J0)
  • vec::bench_retain_u64_000064: [missing] -> pass (J0)
  • vec::bench_retain_u64_000256: [missing] -> pass (J0)
  • vec::bench_retain_u64_001000: [missing] -> pass (J0)
  • vec::bench_retain_u64_010000: [missing] -> pass (J0)
  • vec::bench_retain_u8_000008: [missing] -> pass (J0)
  • vec::bench_retain_u8_000032: [missing] -> pass (J0)
  • vec::bench_retain_u8_000064: [missing] -> pass (J0)
  • vec::bench_retain_whole_u16_000016: [missing] -> pass (J0)
  • vec::bench_retain_whole_u16_000128: [missing] -> pass (J0)
  • vec::bench_retain_whole_u16_000256: [missing] -> pass (J0)
  • vec::bench_retain_whole_u16_100000: [missing] -> pass (J0)
  • vec::bench_retain_whole_u32_000004: [missing] -> pass (J0)
  • vec::bench_retain_whole_u32_000016: [missing] -> pass (J0)
  • vec::bench_retain_whole_u32_000064: [missing] -> pass (J0)
  • vec::bench_retain_whole_u32_010000: [missing] -> pass (J0)
  • vec::bench_retain_whole_u32_100000: [missing] -> pass (J0)
  • vec::bench_retain_whole_u64_000004: [missing] -> pass (J0)
  • vec::bench_retain_whole_u64_000016: [missing] -> pass (J0)
  • vec::bench_retain_whole_u64_000032: [missing] -> pass (J0)
  • vec::bench_retain_whole_u64_000064: [missing] -> pass (J0)
  • vec::bench_retain_whole_u64_000128: [missing] -> pass (J0)
  • vec::bench_retain_whole_u64_000256: [missing] -> pass (J0)
  • vec::bench_retain_whole_u64_000512: [missing] -> pass (J0)
  • vec::bench_retain_whole_u64_100000: [missing] -> pass (J0)
  • vec::bench_retain_whole_u8_000008: [missing] -> pass (J0)
  • vec::bench_retain_whole_u8_000016: [missing] -> pass (J0)
  • vec::bench_retain_whole_u8_000032: [missing] -> pass (J0)
  • vec::bench_retain_whole_u8_000064: [missing] -> pass (J0)
  • vec::bench_retain_whole_u8_000256: [missing] -> pass (J0)
  • vec::bench_retain_whole_u8_010000: [missing] -> pass (J0)
  • vec::bench_retain_whole_u8_100000: [missing] -> pass (J0)

Stage 2

  • vec::bench_retain_iter_u32_000256: [missing] -> pass (J1)
  • vec::bench_retain_iter_u32_000512: [missing] -> pass (J1)
  • vec::bench_retain_u16_000004: [missing] -> pass (J1)
  • vec::bench_retain_u16_000008: [missing] -> pass (J1)
  • vec::bench_retain_u16_000016: [missing] -> pass (J1)
  • vec::bench_retain_u16_000064: [missing] -> pass (J1)
  • vec::bench_retain_u16_000256: [missing] -> pass (J1)
  • vec::bench_retain_u16_001000: [missing] -> pass (J1)
  • vec::bench_retain_u16_100000: [missing] -> pass (J1)
  • vec::bench_retain_u32_000004: [missing] -> pass (J1)
  • vec::bench_retain_u32_000008: [missing] -> pass (J1)
  • vec::bench_retain_u32_000032: [missing] -> pass (J1)
  • vec::bench_retain_u32_000512: [missing] -> pass (J1)
  • vec::bench_retain_u32_001000: [missing] -> pass (J1)
  • vec::bench_retain_u32_010000: [missing] -> pass (J1)
  • vec::bench_retain_u64_000008: [missing] -> pass (J1)
  • vec::bench_retain_u64_000128: [missing] -> pass (J1)
  • vec::bench_retain_u64_000256: [missing] -> pass (J1)
  • vec::bench_retain_u64_000512: [missing] -> pass (J1)
  • vec::bench_retain_u64_001000: [missing] -> pass (J1)
  • vec::bench_retain_u64_010000: [missing] -> pass (J1)
  • vec::bench_retain_u8_000032: [missing] -> pass (J1)
  • vec::bench_retain_u8_000064: [missing] -> pass (J1)
  • vec::bench_retain_u8_000128: [missing] -> pass (J1)
  • vec::bench_retain_u8_001000: [missing] -> pass (J1)
  • vec::bench_retain_u8_010000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u16_000008: [missing] -> pass (J1)
  • vec::bench_retain_whole_u16_000256: [missing] -> pass (J1)
  • vec::bench_retain_whole_u16_010000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u16_100000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u32_000004: [missing] -> pass (J1)
  • vec::bench_retain_whole_u32_000512: [missing] -> pass (J1)
  • vec::bench_retain_whole_u32_001000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u32_010000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u32_100000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u64_000004: [missing] -> pass (J1)
  • vec::bench_retain_whole_u64_000064: [missing] -> pass (J1)
  • vec::bench_retain_whole_u64_000128: [missing] -> pass (J1)
  • vec::bench_retain_whole_u64_000256: [missing] -> pass (J1)
  • vec::bench_retain_whole_u64_000512: [missing] -> pass (J1)
  • vec::bench_retain_whole_u64_100000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u8_000008: [missing] -> pass (J1)
  • vec::bench_retain_whole_u8_000016: [missing] -> pass (J1)
  • vec::bench_retain_whole_u8_000064: [missing] -> pass (J1)
  • vec::bench_retain_whole_u8_000128: [missing] -> pass (J1)
  • vec::bench_retain_whole_u8_001000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u8_010000: [missing] -> pass (J1)
  • vec::bench_retain_whole_u8_100000: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/coroutine-yield-unnormalized-alias.rs: [missing] -> pass (J2)

(and 101 additional test diffs)

Additionally, 594 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 e457a7b0d326d67b4322ef0d11bd715cfaeda48f --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-ext3: 1h 10m -> 1h 55m (+62.5%)
  2. x86_64-msvc-2: 1h 43m -> 2h 33m (+48.3%)
  3. x86_64-msvc-1: 2h 46m -> 1h 42m (-38.3%)
  4. x86_64-gnu-gcc: 1h 17m -> 48m 57s (-36.9%)
  5. dist-s390x-linux: 1h 9m -> 1h 34m (+34.9%)
  6. x86_64-gnu-nopt: 1h 50m -> 2h 28m (+34.2%)
  7. dist-loongarch64-musl: 1h 21m -> 1h 48m (+32.7%)
  8. dist-powerpc64le-linux-gnu: 1h 17m -> 1h 38m (+27.4%)
  9. dist-i686-linux: 1h 58m -> 1h 26m (-26.5%)
  10. dist-x86_64-musl: 2h 29m -> 1h 51m (-25.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.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e457a7b): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

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

Max RSS (memory usage)

Results (primary 0.0%, secondary 1.7%)

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

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

Cycles

Results (primary 0.4%, secondary -17.2%)

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

mean range count
Regressions ❌
(primary)
2.2% [2.1%, 2.3%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.0% [-3.0%, -3.0%] 1
Improvements ✅
(secondary)
-17.2% [-17.8%, -16.6%] 2
All ❌✅ (primary) 0.4% [-3.0%, 2.3%] 3

Binary size

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

Bootstrap: 475.228s -> 476.343s (0.23%)
Artifact size: 402.70 MiB -> 402.74 MiB (0.01%)

@jhpratt
jhpratt deleted the rollup-QMTkuLl branch August 27, 2026 08:29
@rust-bors

rust-bors Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#161034 Add SVE-accelerated Vec::retain_mut for aarch64 3cb86fd14921086217404f0558476a05b2a7616f
(link)
#161628 interpret: ensure that calls via no-unwind ABIs do not unwi… 6dbf9cd4b2b4d7f7462513e8579469127678e4ea
(link)
#161012 borrowck: Normalize non-rigid aliases in NLL type relating 3725ecee73ed59bc40e299354e5504bacb8db8a2
(link)
#161691 Assorted bootstrap config refactors (part 1/N) d19555717e2323ec00e001584a0a8f6d49bdb035
(link)
#161813 Change is_eligible_for_coverage from a hook to a query 36e414c7069dbcd35b8f316c6c4b24af57ef3dd5
(link)
#161842 chore: fix cargo lints f32bc3e944836ea378966dae34948deb54bd9c54
(link)
#161843 rustdoc: fix lint cargo::non_kebab_case_bins 60e4b5b574ad5ad90a2ef39f3db7cdf3426668d8
(link)

parent commit: d9dd0703ba

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

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

Labels

A-compiletest Area: The compiletest test runner 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. T-rustdoc Relevant to the rustdoc 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