Skip to content

Rollup of 5 pull requests - #162382

Merged
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-YTHVgd1
Sep 6, 2026
Merged

Rollup of 5 pull requests#162382
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-YTHVgd1

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

Walnut356 and others added 10 commits September 6, 2026 02:38
Force u8/i8 numeric formatting on LLDB

Resolves a very common annoyance with the existing visualizers. This doesn't touch the behavior that formats char pointers as c-strings since that's its own can of worms (and likely needs to be handled alongside adding the wide pointer visualizer).

I disabled checking `Rc<str>` in `strings-and-strs.rs`, as this patch caused it to fail on `windows-gnu` and the fix is the wide pointer visualizer. Technically, even on `linux-gnu` the test only works because it's seemingly somewhat reliable for there to be a null byte directly after the `str` data, but that's obviously not something we should be relying on.

Also fixes `tests\debuginfo\borrowed-unique-basic.rs` on `windows-msvc` as part of rust-lang#161657 (comment)

r? @Kobzol, @jieyouxu

---

try-job: aarch64-apple-1
try-job: x86_64-mingw-1
…, r=jieyouxu

Use `lldb.eTypeOptionHideChildren` for msvc tuples

Changes output from e.g. `(8, 5.5) { 0:8, 1:5.5 }` to just `(8, 5.5)` to match non-msvc handling.

Fixes the following tests on `windows-msvc` (see rust-lang#161657):

* `tests\debuginfo\borrowed-tuple.rs`
* `tests\debuginfo\box.rs`
* `tests\debuginfo\cross-crate-spans.rs`
* `tests\debuginfo\destructured-local.rs`
* `tests\debuginfo\pretty-std-collections.rs`
* `tests\debuginfo\simple-tuple.rs`
* `tests\debuginfo\tuple-in-tuple.rs`

Also partially fixes `tests\debuginfo\associated-types.rs`

r? @Kobzol, @jieyouxu

---

try-job: x86_64-msvc-1
try-job: aarch64-msvc-1
Use `#[repr(C)]` on debuginfo test structs

This fixes a couple of issues.

* LLDB reading PDB debug info re-orders fields and displays them in offset order instead of source-order like DWARF. While this has been [fixed upstream](llvm/llvm-project#218731), it'll be quite a while before it's reflected in CI runners and such
* For all targets, the structs were often written (and named) under the assumption that they would have specific layouts. Nothing was actually enforcing those assumed layouts, so very often a type would be named e.g. `HasInternalPadding` but rust would reorder it such that no internal padding existed.

`struct-with-destructor.rs` is still iffy. I'll test it when I get home and can update my main PC's LLDB.

On my remote PC (lldb 22.1.2) it didn't fix the test, and it looked like the variable was straight up being read incorrectly:

 ```
// expected:
 (struct_with_destructor::NestedOuter) nested = {a:{a:{x:7890, y:9870}}}
// got:
 (struct_with_destructor::NestedOuter) nested = {a:{a:{y:1378684509906, x:9870}}
 ```
On my laptop when manually inspecting it (CodeLLDB which uses 22.1.8 under the hood) everything looked fine, so it might have been a bug that LLDB patched.

Part of the MSVC test fixes for rust-lang#161657

r? @Kobzol, @jieyouxu

---

test-jobs: aarch64-apple-1
test-jobs: aarch64-msvc-1
test-jobs: x86_64-msvc-1
test-jobs: x86_64-mingw-1
…nyukang

remove stale/duplicate tests

Conversation from: https://rust-lang.zulipchat.com/#narrow/channel/122651-general/topic/Duplicate.20tests/with/621165039

* `recursion2.rs` -> `recursion1.rs`
* `drop-track-field-assign-nonsend.rs` -> `field-assign-nonsend.rs`
* `drop-track-field-assign.rs` -> `field-assign.rs`
* `suggest-local-var-for-vector.rs` -> `suggest-storing-local-var-for-vector.rs`
* `recursion-issue-105275.rs` -> `recursion-issue-105937.rs`
* `migrate-fail.rs` -> `nll-fail.rs`
* `migrate-pass.rs` -> `nll-pass.rs`
* `issue-29914-2.rs` -> `issue-29914.rs`
* `drop-tracking-parent-expression.rs` -> `parent-expression.rs`
* `tuple-like-structs-cross-crate-7899.rs` -> `tuple-struct-cross-crate-7899.rs`
* `E0508-fail.rs` -> `E0508.rs`
* `ex3-both-anon-regions-one-is-struct-4.rs` -> `ex3-both-anon-regions-one-is-struct-3.rs`
* `stability_cfg2.rs` -> `stability-cfg2.rs`
* `issue-1802-2.rs` -> `issue-1802-1.rs`
* `tool_lints_2018_preview.rs` -> `tool_lints-rpass.rs`
* `issue-58951-2.rs` -> `issue-58951.rs`
* `issue-74761-2.rs` -> `issue-74761.rs`
* `issue-30276-feature-flagged.rs` -> `issue-30276.rs`
Add several new LLDB feature flags

These flags aren't currently used anywhere, but the features they describe are *incredibly* useful (particularly for a wide pointer visualizer that I have in the works). This patch serves both to document them (especially a feature we *shouldn't* use), and to prep for future visualizers.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Sep 6, 2026
@rustbot rustbot added A-tidy Area: The tidy tool 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 Sep 6, 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 Sep 6, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f5d6bdc 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 Sep 6, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Sep 6, 2026
Rollup of 5 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 Sep 6, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 3c73819 (3c73819f7f10c54e3262cc76fae570fb106557e6)
Base parent: da47efd (da47efd27287edb02eed0b5a178a165c8f258e37)

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

rust-bors Bot commented Sep 6, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 5m 49s
Pushing 5a2be9f to main...

@rust-bors
rust-bors Bot merged commit 5a2be9f into rust-lang:main Sep 6, 2026
15 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 6, 2026
@github-actions

github-actions Bot commented Sep 6, 2026

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 da47efd (parent) -> 5a2be9f (this PR)

Test differences

Show 51 test diffs

Stage 1

  • [ui] tests/ui/async-await/drop-track-field-assign-nonsend.rs: pass -> [missing] (J1)
  • [ui] tests/ui/async-await/drop-track-field-assign.rs: pass -> [missing] (J1)
  • [ui] tests/ui/borrowck/suggest-local-var-for-vector.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/normalization-overflow/recursion-issue-105275.rs: pass -> [missing] (J1)
  • [ui] tests/ui/consts/const-blocks/migrate-fail.rs: pass -> [missing] (J1)
  • [ui] tests/ui/consts/const-blocks/migrate-pass.rs: pass -> [missing] (J1)
  • [ui] tests/ui/consts/issue-29914-3.rs: pass -> [missing] (J1)
  • [ui] tests/ui/coroutine/drop-tracking-parent-expression.rs: pass -> [missing] (J1)
  • [ui] tests/ui/cross-crate/tuple-like-structs-cross-crate-7899.rs: pass -> [missing] (J1)
  • [ui] tests/ui/error-codes/E0508-fail.rs: pass -> [missing] (J1)
  • [ui] tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-5.rs: pass -> [missing] (J1)
  • [ui] tests/ui/parser/issues/issue-1802-2.rs: pass -> [missing] (J1)
  • [ui] tests/ui/tool-attributes/tool_lints_2018_preview.rs: pass -> [missing] (J1)
  • [ui] tests/ui/type-alias-impl-trait/issue-58951-2.rs: pass -> [missing] (J1)
  • [ui] tests/ui/type-alias-impl-trait/issue-74761-2.rs: pass -> [missing] (J1)
  • [ui] tests/ui/unsized-locals/issue-30276-feature-flagged.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/async-await/drop-track-field-assign-nonsend.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/async-await/drop-track-field-assign.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/borrowck/suggest-local-var-for-vector.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/codegen/normalization-overflow/recursion-issue-105275.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/consts/const-blocks/migrate-fail.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/consts/const-blocks/migrate-pass.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/consts/issue-29914-3.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/coroutine/drop-tracking-parent-expression.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/cross-crate/tuple-like-structs-cross-crate-7899.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/error-codes/E0508-fail.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-5.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/parser/issues/issue-1802-2.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/tool-attributes/tool_lints_2018_preview.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/type-alias-impl-trait/issue-58951-2.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/type-alias-impl-trait/issue-74761-2.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/unsized-locals/issue-30276-feature-flagged.rs: pass -> [missing] (J2)

Stage 2

  • [ui] tests/ui/async-await/drop-track-field-assign-nonsend.rs: pass -> [missing] (J0)
  • [ui] tests/ui/async-await/drop-track-field-assign.rs: pass -> [missing] (J0)
  • [ui] tests/ui/borrowck/suggest-local-var-for-vector.rs: pass -> [missing] (J0)
  • [ui] tests/ui/codegen/normalization-overflow/recursion-issue-105275.rs: pass -> [missing] (J0)
  • [ui] tests/ui/consts/const-blocks/migrate-fail.rs: pass -> [missing] (J0)
  • [ui] tests/ui/consts/const-blocks/migrate-pass.rs: pass -> [missing] (J0)
  • [ui] tests/ui/consts/issue-29914-3.rs: pass -> [missing] (J0)
  • [ui] tests/ui/coroutine/drop-tracking-parent-expression.rs: pass -> [missing] (J0)
  • [ui] tests/ui/cross-crate/tuple-like-structs-cross-crate-7899.rs: pass -> [missing] (J0)
  • [ui] tests/ui/error-codes/E0508-fail.rs: pass -> [missing] (J0)
  • [ui] tests/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-one-is-struct-5.rs: pass -> [missing] (J0)
  • [ui] tests/ui/parser/issues/issue-1802-2.rs: pass -> [missing] (J0)
  • [ui] tests/ui/tool-attributes/tool_lints_2018_preview.rs: pass -> [missing] (J0)
  • [ui] tests/ui/type-alias-impl-trait/issue-58951-2.rs: pass -> [missing] (J0)
  • [ui] tests/ui/type-alias-impl-trait/issue-74761-2.rs: pass -> [missing] (J0)
  • [ui] tests/ui/unsized-locals/issue-30276-feature-flagged.rs: pass -> [missing] (J0)

Additionally, 3 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 5a2be9f5f075d31e3ca5526b5b029881ce441253 --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. optional-x86_64-gnu-autodiff: 34m 28s -> 51m 23s (+49.1%)
  2. dist-x86_64-msvc-alt: 1h 32m -> 2h 13m (+43.5%)
  3. x86_64-gnu-distcheck: 1h 31m -> 2h 9m (+40.5%)
  4. dist-x86_64-musl: 1h 37m -> 2h 15m (+39.2%)
  5. x86_64-rust-for-linux: 41m 32s -> 55m 11s (+32.9%)
  6. i686-gnu-nopt-2: 1h 46m -> 2h 21m (+32.8%)
  7. x86_64-gnu-stable: 2h 37m -> 1h 49m (-30.3%)
  8. i686-gnu-nopt-1: 1h 41m -> 2h 9m (+27.2%)
  9. dist-arm-linux-musl: 1h 48m -> 1h 18m (-27.2%)
  10. x86_64-gnu-tools: 1h 3m -> 46m 57s (-26.3%)
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 (5a2be9f): 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)

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

Cycles

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

Binary size

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

Bootstrap: 479.814s -> 476.006s (-0.79%)
Artifact size: 403.41 MiB -> 403.41 MiB (-0.00%)

@rust-bors

rust-bors Bot commented Sep 6, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#162358 Force u8/i8 numeric formatting on LLDB 8d7b52ffd0c06145231c810b549f35308f0f9710
(link)
#162359 Use lldb.eTypeOptionHideChildren for msvc tuples 53d1b3dae0cbdc8aef5cde2e550f7ed23296e2be
(link)
#162364 Use #[repr(C)] on debuginfo test structs 7ff18ceae418e4a06065ae6ede35e3d0d791ffa2
(link)
#162215 remove stale/duplicate tests c4b3baab2547660366d722f6c94692a71bfaec3a
(link)
#162335 Add several new LLDB feature flags a674b3347ca5546a89abd247ed0a92f893e6aaec
(link)

parent commit: da47efd272

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-tidy Area: The tidy tool 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.

5 participants