Skip to content

Rollup of 9 pull requests #144488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jul 26, 2025
Merged

Rollup of 9 pull requests #144488

merged 22 commits into from
Jul 26, 2025

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Jul 26, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Nadrieril and others added 22 commits July 20, 2025 18:27
Previously, the musl root would only be set to the fallback /usr by
the sanity check, which isn't ran for the bootstrap tests.

Signed-off-by: Jens Reidel <[email protected]>
This primarily pulls in alexcrichton/dlmalloc-rs/55 and
alexcrichton/dlmalloc-rs/54 to address 144199. Notably the highest byte
in the wasm address space is no longer allocatable and additionally the
allocator internally uses `wrapping_add` instead of `add` on pointers
since on 32-bit platforms offsets might be larger than half the address
space.
Signed-off-by: Jens Reidel <[email protected]>
When encountering a moved value of a type that isn't `Clone` because of unmet obligations, but where all the unmet predicates reference crate-local types, mention them and suggest cloning, as we do in other cases already:

```
error[E0507]: cannot move out of `foo`, a captured variable in an `Fn` closure
  --> f111.rs:14:25
   |
13 | fn do_stuff(foo: Option<Foo>) {
   |             --- captured outer variable
14 |     require_fn_trait(|| async {
   |                      -- ^^^^^ `foo` is moved here
   |                      |
   |                      captured by this `Fn` closure
15 |         if foo.map_or(false, |f| f.foo()) {
   |            ---
   |            |
   |            variable moved due to use in coroutine
   |            move occurs because `foo` has type `Option<Foo>`, which does not implement the `Copy` trait
   |
note: if `Foo` implemented `Clone`, you could clone the value
  --> f111.rs:4:1
   |
4  | struct Foo;
   | ^^^^^^^^^^ consider implementing `Clone` for this type
...
15 |         if foo.map_or(false, |f| f.foo()) {
   |            --- you could clone this value
```
…=jieyouxu

Rehome 35 `tests/ui/issues/` tests to other subdirectories under `tests/ui/`

rust-lang#143902 divided into smaller, easier to review chunks.

Part of rust-lang#133895

Methodology:

1. Refer to the previously written `tests/ui/SUMMARY.md`
2. Find an appropriate category for the test, using the original issue thread and the test contents.
3. Add the issue URL at the bottom (not at the top, as that would mess up stderr line numbers)
4. Rename the tests to make their purpose clearer

The URL addition at the end, as well as moving around the auxiliary files and editing the `stderr` files with the new filename, were done using a Python script.

Inspired by the methodology that `@Kivooeo` was using.

r? `@jieyouxu`
…davidtwco

pattern_analysis: add option to get a full set of witnesses

This adds an option to the rustc_pattern_analysis machinery to have it report a complete set of patterns when a match is non-exhaustive (by default we only guarantee to report _some_ missing patterns). This is for use in rust-analyzer.

Leaving as draft until I'm sure this is what r-a needs.

r? ghost
Mention type that could be `Clone` but isn't in more cases

When encountering a moved value of a type that isn't `Clone` because of unmet obligations, but where all the unmet predicates reference crate-local types, mention them and suggest cloning, as we do in other cases already:

```
error[E0507]: cannot move out of `foo`, a captured variable in an `Fn` closure
  --> f111.rs:14:25
   |
13 | fn do_stuff(foo: Option<Foo>) {
   |             --- captured outer variable
14 |     require_fn_trait(|| async {
   |                      -- ^^^^^ `foo` is moved here
   |                      |
   |                      captured by this `Fn` closure
15 |         if foo.map_or(false, |f| f.foo()) {
   |            ---
   |            |
   |            variable moved due to use in coroutine
   |            move occurs because `foo` has type `Option<Foo>`, which does not implement the `Copy` trait
   |
note: if `Foo` implemented `Clone`, you could clone the value
  --> f111.rs:4:1
   |
4  | struct Foo;
   | ^^^^^^^^^^ consider implementing `Clone` for this type
...
15 |         if foo.map_or(false, |f| f.foo()) {
   |            --- you could clone this value
```

CC rust-lang#68119.
…=Kobzol

bootstrap: Move musl-root fallback out of sanity check

Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests.

r? ``````@Kobzol``````
…_test, r=wesleywiser

Enable dwarf-mixed-versions-lto.rs test on RISC-V (riscv64)

This PR replaces [rust-lang#144284](rust-lang#144284) to resolve merge conflicts.

This PR adds support for running the `tests/assembly/dwarf-mixed-versions-lto.rs` test on the RISC-V (riscv64) architecture.

Previously, this test would fail on RISC-V targets due to architecture-specific code generation issues. This patch modifies the test to ensure compatibility while preserving its intent.

The change has been tested locally using `./x test` on a riscv64 target, and the test now passes as expected.

### Notes:
- This change is scoped specifically to improve RISC-V compatibility.
- It does not affect behavior or test results on other architectures.
…leywiser

Enable const-vector.rs test on RISC-V (riscv64)

This PR replaces [rust-lang#144283](rust-lang#144283) to resolve merge conflicts.

This PR adds support for running the `tests/codegen/const-vector.rs` test on the RISC-V (riscv64) architecture.

Previously, this test would fail on RISC-V targets due to architecture-specific code generation issues. This patch modifies the test to ensure compatibility while preserving its intent.

The change has been tested locally using `./x test` on a riscv64 target, and the test now passes as expected.

### Notes:
- This change is scoped specifically to improve RISC-V compatibility.
- It does not affect behavior or test results on other architectures.
RustWrapper: Suppress getNextNonDebugInfoInstruction

Link: llvm/llvm-project#144383
…=jieyouxu

Add `ignore-backends` annotations in failing GCC backend ui tests

Follow-up of rust-lang#144125.

In the GCC backend, we don't support all ui tests yet and we have a list of tests we currently ignore available [here](https://github.com/rust-lang/rustc_codegen_gcc/blob/master/tests/failing-ui-tests.txt).

This PR adds the `ignore-backends` annotations to the corresponding ui tests.

The second commit is a fix to compiletest, complaining about `ignore-backends`.

r? ```@jieyouxu```
…rk-Simulacrum

Update `dlmalloc` dependency of libstd

This primarily pulls in alexcrichton/dlmalloc-rs#55 and alexcrichton/dlmalloc-rs#54 to address rust-lang#144199. Notably the highest byte in the wasm address space is no longer allocatable and additionally the allocator internally uses `wrapping_add` instead of `add` on pointers since on 32-bit platforms offsets might be larger than half the address space.

Closes rust-lang#144199
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc PG-exploit-mitigations Project group: Exploit mitigations 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. labels Jul 26, 2025
@rustbot rustbot added the rollup A PR which is a rollup label Jul 26, 2025
@tgross35
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 26, 2025

📌 Commit a230b4f has been approved by tgross35

It is now in the queue for this repository.

@bors bors 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 Jul 26, 2025
@bors
Copy link
Collaborator

bors commented Jul 26, 2025

⌛ Testing commit a230b4f with merge 051d0e8...

@bors
Copy link
Collaborator

bors commented Jul 26, 2025

☀️ Test successful - checks-actions
Approved by: tgross35
Pushing 051d0e8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 26, 2025
@bors bors merged commit 051d0e8 into rust-lang:master Jul 26, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 26, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#144089 Rehome 35 tests/ui/issues/ tests to other subdirectories … cb172dbf5278db99638055d1cc921a0432462eb0 (link)
#144171 pattern_analysis: add option to get a full set of witnesses e0fde9b2cce434cc9c2a6dcb7ad1b3b80a2a1dda (link)
#144201 Mention type that could be Clone but isn't in more cases 802b638406d6cbfe6b6e1d7791ac355b03ba6897 (link)
#144316 bootstrap: Move musl-root fallback out of sanity check c2e44bd97cf3cb45906e864bbf2c948859dd526e (link)
#144339 Enable dwarf-mixed-versions-lto.rs test on RISC-V (riscv64) c6a2565fa4d0e773d9615aa9741841cd1051c5f9 (link)
#144341 Enable const-vector.rs test on RISC-V (riscv64) f47fdc159af828ece64ed4a53be7d380f577ec9d (link)
#144352 RustWrapper: Suppress getNextNonDebugInfoInstruction 2cdd754e233f6b2964ce473e1d1ab9c3c1652206 (link)
#144356 Add ignore-backends annotations in failing GCC backend ui… 21fe3fcee80606ebe37cb2e475b3f78d54955016 (link)
#144364 Update dlmalloc dependency of libstd a1511455670f595ac53fba4341d51c21a2b582e7 (link)

previous master: f32b23204a

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

Copy link
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 f32b232 (parent) -> 051d0e8 (this PR)

Test differences

Show 133 test diffs

Stage 1

  • [ui] tests/ui/cast/trait-object-cast-segfault-4333.rs: [missing] -> pass (J1)
  • [ui] tests/ui/codegen/dynamic-size-of-prefix-correctly-36278.rs: [missing] -> pass (J1)
  • [ui] tests/ui/const-generics/generic-parameter-in-const-expression-39211.rs: [missing] -> pass (J1)
  • [ui] tests/ui/cross-crate/exporting-impl-from-root-causes-ice-2472.rs: [missing] -> pass (J1)
  • [ui] tests/ui/derives/invalid-derive-comparison-34229.rs: [missing] -> pass (J1)
  • [ui] tests/ui/drop/drop-immediate-non-box-ty-9446.rs: [missing] -> pass (J1)
  • [ui] tests/ui/enum/recursive-enum-memory-32326.rs: [missing] -> pass (J1)
  • [ui] tests/ui/generics/generic-impl-method-match-autoderef-18514.rs: [missing] -> pass (J1)
  • [ui] tests/ui/issues/issue-106755.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-14382.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-18514.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-18952.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-21174.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-22789.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-2472.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-32326.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-3389.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-34229.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-34418.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-36278-prefix-nesting.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-36839.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-37534.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-39089.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-39211.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-41229-ref-str.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-46964.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-5321-immediates-with-bare-self.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-53843.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-54062.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-67552.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-9446.rs: pass -> [missing] (J1)
  • [ui] tests/ui/iterators/iterator-adapter-undeclared-type-49544.rs: [missing] -> pass (J1)
  • [ui] tests/ui/macros/macro-invocation-with-curly-braces-34418.rs: [missing] -> pass (J1)
  • [ui] tests/ui/marker_trait_attr/conflicting-send-impls-for-marker-trait-106755.rs: [missing] -> pass (J1)
  • [ui] tests/ui/methods/inherent-method-resolution-on-deref-type-53843.rs: [missing] -> pass (J1)
  • [ui] tests/ui/privacy/private-field-access-in-mutex-54062.rs: [missing] -> pass (J1)
  • [ui] tests/ui/recursion/recursive-impl-trait-iterator-by-ref-67552.rs: [missing] -> pass (J1)
  • [ui] tests/ui/return/early-return-with-unreachable-code-24353.rs: [missing] -> pass (J1)
  • [ui] tests/ui/sized/relaxing-default-bound-error-37534.rs: [missing] -> pass (J1)
  • [ui] tests/ui/structs/trie-node-structure-usage-3389.rs: [missing] -> pass (J1)
  • [ui] tests/ui/trait-bounds/for-binder-placement-error-39089.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/dyn-trait-size-error-23281.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/trait-associated-type-bounds-36839.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/trait-implementation-for-usize-5321.rs: [missing] -> pass (J1)
  • [ui] tests/ui/transmutability/transmute-between-associated-types-with-lifetimers-21174.rs: [missing] -> pass (J1)
  • [ui] tests/ui/type-inference/float-type-inference-unification-14382.rs: [missing] -> pass (J1)
  • [ui] tests/ui/unboxed-closures/fn-traits-overloading-arity-18952.rs: [missing] -> pass (J1)
  • [ui] tests/ui/unboxed-closures/unboxed-closure-call-22789.rs: [missing] -> pass (J1)
  • [ui] tests/ui/unreachable-code/unreachable-bool-read-7246.rs: [missing] -> pass (J1)
  • [ui] tests/ui/unsized/unsized-function-argument-41229.rs: [missing] -> pass (J1)
  • test_witnesses: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/codegen/dynamic-size-of-prefix-correctly-36278.rs: [missing] -> pass (J0)
  • [ui] tests/ui/const-generics/generic-parameter-in-const-expression-39211.rs: [missing] -> pass (J0)
  • [ui] tests/ui/cross-crate/exporting-impl-from-root-causes-ice-2472.rs: [missing] -> pass (J0)
  • [ui] tests/ui/derives/invalid-derive-comparison-34229.rs: [missing] -> pass (J0)
  • [ui] tests/ui/drop/drop-immediate-non-box-ty-9446.rs: [missing] -> pass (J0)
  • [ui] tests/ui/generics/generic-impl-method-match-autoderef-18514.rs: [missing] -> pass (J0)
  • [ui] tests/ui/issues/issue-106755.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-14382.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-18514.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-18952.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-22789.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-23281.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-24353.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-2472.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-32326.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-3389.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-34229.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-34418.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-36278-prefix-nesting.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-36839.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-37534.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-39089.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-41229-ref-str.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-4333.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-46964.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-49544.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-5280.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-5321-immediates-with-bare-self.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-53843.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-54062.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-67552.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-9446.rs: pass -> [missing] (J0)
  • [ui] tests/ui/macros/macro-invocation-with-curly-braces-34418.rs: [missing] -> pass (J0)
  • [ui] tests/ui/marker_trait_attr/conflicting-send-impls-for-marker-trait-106755.rs: [missing] -> pass (J0)
  • [ui] tests/ui/match/innocent-looking-match-crash-46964.rs: [missing] -> pass (J0)
  • [ui] tests/ui/methods/inherent-method-resolution-on-deref-type-53843.rs: [missing] -> pass (J0)
  • [ui] tests/ui/privacy/private-field-access-in-mutex-54062.rs: [missing] -> pass (J0)
  • [ui] tests/ui/return/early-return-with-unreachable-code-24353.rs: [missing] -> pass (J0)
  • [ui] tests/ui/sized/relaxing-default-bound-error-37534.rs: [missing] -> pass (J0)
  • [ui] tests/ui/structs/trie-node-structure-usage-3389.rs: [missing] -> pass (J0)
  • [ui] tests/ui/trait-bounds/for-binder-placement-error-39089.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/dyn-trait-size-error-23281.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/trait-associated-type-bounds-36839.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/trait-implementation-for-usize-5321.rs: [missing] -> pass (J0)
  • [ui] tests/ui/transmutability/transmute-between-associated-types-with-lifetimers-21174.rs: [missing] -> pass (J0)
  • [ui] tests/ui/type-inference/float-type-inference-unification-14382.rs: [missing] -> pass (J0)
  • [ui] tests/ui/unboxed-closures/fn-traits-overloading-arity-18952.rs: [missing] -> pass (J0)
  • [ui] tests/ui/unboxed-closures/unboxed-closure-call-22789.rs: [missing] -> pass (J0)
  • [ui] tests/ui/unreachable-code/unreachable-bool-read-7246.rs: [missing] -> pass (J0)

(and 17 additional test diffs)

Additionally, 16 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 051d0e8a957c98f87ddaf6295c3a3ecd88742ff9 --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. dist-aarch64-linux: 8304.1s -> 5888.3s (-29.1%)
  2. x86_64-apple-2: 4500.9s -> 3676.4s (-18.3%)
  3. pr-check-2: 2657.5s -> 2177.9s (-18.0%)
  4. i686-gnu-1: 8805.8s -> 7428.4s (-15.6%)
  5. pr-check-1: 1781.0s -> 1517.4s (-14.8%)
  6. aarch64-msvc-2: 6075.5s -> 5383.0s (-11.4%)
  7. x86_64-gnu-llvm-20-1: 3672.6s -> 3290.3s (-10.4%)
  8. dist-i586-gnu-i586-i686-musl: 5575.7s -> 6151.1s (10.3%)
  9. dist-aarch64-msvc: 6463.6s -> 5814.3s (-10.0%)
  10. i686-gnu-2: 6048.9s -> 5473.0s (-9.5%)
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
Collaborator

Finished benchmarking commit (051d0e8): 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
Regressions ❌
(secondary)
0.5% [0.3%, 0.6%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary -2.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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.2% [-3.1%, -1.1%] 3
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 467.999s -> 467.491s (-0.11%)
Artifact size: 376.62 MiB -> 376.63 MiB (0.00%)

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-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.