Skip to content

Rollup of 6 pull requests - #161226

Merged
rust-bors[bot] merged 18 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-StkCbag
Aug 17, 2026
Merged

Rollup of 6 pull requests#161226
rust-bors[bot] merged 18 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-StkCbag

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

jdonszelmann and others added 18 commits August 10, 2026 12:32
…ions-on-binders, r=adwinwhite

Fix: WF ICE assumptions on binders

Fixes rust-lang#160293

`-Zassumptions-on-binders` ICEs because the solver's `well_formed_goals` passes terms with resolvable inference variables to `unnormalized_obligations`, which asserts they're already resolved (unlike other callers).

Resolve inference variables before computing WF obligations.
…-set-docs, r=nnethercote

Better comments on small copy lists, explaining the limitations better

r? @nnethercote

> [!NOTE]
> I've not used an LLM for any part of this PR, or any other PR I make. This includes any related work like research.
…ark-Simulacrum

Add nightly-only support for Cargo unremap trim-paths files in `rust-lldb`

Same as rust-lang#160560 but for `rust-lldb`.

This PR adds support in `rust-lldb` for the un-remapping file produced by Cargo with `-Ztrim-paths` (rust-lang/cargo#17303). This support is nightly-only, and only activated when `RUST_LLDB_TRIM_PATHS=unstable` is set.

The processing is identical to the GDB script, the differences are regarding the interaction with LLDB and the need to setup a background thread.
Reduce minimum LLDB to 21.1.0 for `lldb-repr` tests

I wrote `lldb-repr` against LLDB 22, but i don't think i actually use any 22-specific features. PR CI currently uses 21 iirc, so i'm curious if they pass there.

r? @Kobzol , @jieyouxu
Clean up some `lldb_batchmode` lints

Notably, this also removes all(?) of the python 2 compatibility stuff. Since we're pinning CI LLDB/GDB anyway, and neither support python 2 anymore afaik, it shouldn't cause any issues.

r? @jieyouxu , @Kobzol
bootstrap: Make various things non-pub

- Previously: rust-lang#161157
---

During my quest to move things out of bootstrap's `lib.rs`, I have found several clusters of code that start to emit dead-code warnings when `lib.rs` is cleared out.

This PR aims to pre-emptively resolve some of those clusters, by making various things non-pub and dealing with the resulting warnings.

There should be no change to bootstrap behaviour.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 17, 2026
@rustbot rustbot added 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Aug 17, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple-1,aarch64-apple-2,x86_64-mingw-1,i686-msvc-1,i686-msvc-2

@rust-bors

rust-bors Bot commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 4d181ed 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 Aug 17, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 17, 2026
Rollup of 6 pull requests


try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple-1
try-job: aarch64-apple-2
try-job: x86_64-mingw-1
try-job: i686-msvc-1
try-job: i686-msvc-2
@rust-bors

This comment has been minimized.

@rust-bors

rust-bors Bot commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: ea8b444 (ea8b44489b89ef092bd1675dc14041ada7a6cd4d)
Base parent: 8962dda (8962ddaf8ee41101345dcbb63de048f3fa10791e)

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

rust-bors Bot commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 2h 56m 40s
Pushing 6d656b1 to main...

@rust-bors
rust-bors Bot merged commit 6d656b1 into rust-lang:main Aug 17, 2026
15 checks passed
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling glob-match v0.2.1
   Compiling ureq v3.0.8
   Compiling citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)
    Finished `release` profile [optimized] target(s) in 43.41s
     Running `target/release/citool post-merge-report cfadd1031079248a7b019ed3f53bbdb41ca055fc 6d656b1efca82491a110b476ac9bbe712628ccb6`
Downloading metrics of job aarch64-gnu
Downloading metrics of job aarch64-gnu-debug
Downloading metrics of job arm-android
Downloading metrics of job armhf-gnu
Downloading metrics of job dist-aarch64-linux
Downloading metrics of job dist-android
Downloading metrics of job dist-arm-linux-gnueabi
---
Downloading metrics of job x86_64-gnu-gcc
Downloading metrics of job x86_64-gnu-gcc-core-tests
Downloading metrics of job x86_64-gnu-next-trait-solver-polonius
<details>
<summary>What is this?</summary>
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.
</details>


Comparing cfadd1031079248a7b019ed3f53bbdb41ca055fc (parent) -> 6d656b1efca82491a110b476ac9bbe712628ccb6 (this PR)

# Test differences
<details>
<summary>Show 25 test diffs
</summary>

## Stage 1
- `[ui] tests/ui/assumptions_on_binders/resolve-infer-var-wf.rs`: [missing] -> pass (**J0**)
- `[ui (polonius)] tests/ui/assumptions_on_binders/resolve-infer-var-wf.rs`: [missing] -> pass (**J2**)
## Stage 2
- `[ui] tests/ui/assumptions_on_binders/resolve-infer-var-wf.rs`: [missing] -> pass (**J1**)

Additionally, 22 doctest diffs were found. These are ignored, as they are noisy.

**Job group index**

- **J0**: [x86_64-gnu-llvm-21-3](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090130), [x86_64-gnu-llvm-22-3](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090133), [x86_64-gnu-next-trait-solver-polonius](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093335)
- **J1**: [aarch64-apple-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093155), [aarch64-apple-macos-26-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093157), [aarch64-gnu](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388089609), [aarch64-gnu-llvm-21-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093233), [aarch64-msvc-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093204), [arm-android](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388089918), [armhf-gnu](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388089680), [i686-gnu-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090097), [i686-gnu-nopt-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090000), [i686-msvc-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093288), [test-various](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388089971), [x86_64-gnu](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388089940), [x86_64-gnu-debug](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090180), [x86_64-gnu-gcc](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093284), [x86_64-gnu-llvm-21](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093270), [x86_64-gnu-llvm-21-2](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090275), [x86_64-gnu-llvm-22-2](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090151), [x86_64-gnu-nopt](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090066), [x86_64-gnu-parallel-frontend](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090230), [x86_64-gnu-stable](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388090331), [x86_64-mingw-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093819), [x86_64-msvc-1](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093268)
- **J2**: [x86_64-gnu-next-trait-solver-polonius](https://github.com/rust-lang/rust/actions/runs/32030067777#summary-95388093335)
</details>

<details>
<summary>Test dashboard</summary>

Run

```bash
cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 6d656b1efca82491a110b476ac9bbe712628ccb6 --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-stdlib-semver-check: 5m 23s -> 11m 27s (+112.6%)
  2. i686-gnu-nopt-1: 1h 17m -> 2h 12m (+71.1%)
  3. x86_64-gnu-gcc-core-tests: 8m 28s -> 13m 43s (+61.9%)
  4. test-various: 1h 57m -> 1h 12m (-38.3%)
  5. x86_64-rust-for-linux: 34m 58s -> 46m 41s (+33.5%)
  6. dist-ohos-aarch64: 1h 16m -> 53m 29s (-30.5%)
  7. dist-s390x-linux: 1h 5m -> 1h 25m (+30.3%)
  8. dist-ohos-armv7: 1h 12m -> 52m 59s (-26.6%)
  9. x86_64-gnu-debug: 1h 54m -> 1h 24m (-26.2%)
  10. x86_64-gnu-nopt: 2h 16m -> 1h 41m (-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.

HTTP 503: No server is currently available to service your request. Sorry about that. Please try resubmitting your request and contact us if the problem persists. (https://api.github.com/graphql)
##[error]Process completed with exit code 1.
Post job cleanup.


</details>

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (6d656b1): 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 (secondary 3.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)
3.2% [1.8%, 4.5%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

Results (secondary 6.7%)

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

Binary size

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

Bootstrap: 457.931s -> 468.493s (2.31%)
Artifact size: 398.90 MiB -> 398.93 MiB (0.01%)

@rust-bors

rust-bors Bot commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#160497 Fix: WF ICE assumptions on binders 42fce77dd561d403c5ca81bafa267a05025f9216
(link)
#160845 Better comments on small copy lists, explaining the limitat… 2e00d1c94673c184ff03f8592d386cafdc75981f
(link)
#160869 Add nightly-only support for Cargo unremap trim-paths files… ❌ build failed ❌
#161214 Reduce minimum LLDB to 21.1.0 for lldb-repr tests 74f1f612fdc6419181fd59b835b24db90579cf1f
(link)
#161216 Clean up some lldb_batchmode lints 9bf2db1a6a3360c66d6bdae4847b85420abb7ffa
(link)
#161219 bootstrap: Make various things non-pub dd081b4da702e4ecbc5e727779d3fa8d267c2b27
(link)

parent commit: cfadd10310

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

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. 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