Skip to content

Conversation

@GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Nov 3, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Kivooeo and others added 30 commits October 25, 2025 19:20
As we discussed, it is identical with dead_stores_79191
* `set_hook` expects a boxed function
* Missing closing delimiter for the closure
To support loading dependencies with target modifiers and avoid ABI
mismatch errors.
… r=davidtwco

Add FileCheck annotations to mir-opt/copy-prop

This resolves a part of rust-lang#116971 .

This PR adds FileCheck annotations to test files under mir-opt/copy-prop.
Give correct suggestion for a typo in raw pointers

This adds a check for when user wrote `const* T` instead of `*const T`, I just saw how a C-person made this typo and compiler suggests this

```rust
 --> src/main.rs:2:17
  |
2 |     let p: const* u8 = 0 as _;
  |                 ^
  |
help: add `mut` or `const` here
  |
2 |     let p: const*mut  u8 = 0 as _;
  |                  +++
2 |     let p: const*const  u8 = 0 as _;
  |                  +++++
```

which is very incorrect

also fixes rust-lang#136602

r? compiler
Prepare to move debugger discovery from compiletest to bootstrap

For a while I've been wanting to move debugger discovery out of compiletest and into bootstrap, so that bootstrap would be responsible for deciding which debugger to use, and compiletest would faithfully use that debugger with no extra magic (and no horrible config-duplicating hacks).

Making that change is complicated, and eventually I had so many intertwined preparatory changes that I split them off into this PR, so that it can be reviewed and tested as a smaller chunk.

---

To avoid scope creep, the changes in this PR try to move code as-is as much as possible, even if the moved code could arguably benefit from further cleanups. And in many cases, that code will need to be further overhauled anyway when discovery steps are actually moved out of compiletest.
…=GuillaumeGomez

rustdoc: fix `--emit=dep-info` on scraped examples

Makes sure both stages (the scraping process itself, and the doc build) emit complete dependency lists.

CC rust-lang#146220
Part of rust-lang#83784
…hercote

Remove double check when decoding ExpnId to avoid races

Fixes debug assertion failure as described in rust-lang#141540 (comment)

Essentially failure happens during the race while decoding one `ExpnId` from different threads. This ICE doesn't happen with single threaded thread_pool due to early return within `decode_expn_id` with the same condition:

https://github.com/rust-lang/rust/blob/8205e6b75ec656305ac235d4726d2c7a1ddcef14/compiler/rustc_middle/src/query/on_disk_cache.rs#L605-L607

However I believe this race does not hurt because `register_expn_id` is pretty much idempotent:

https://github.com/rust-lang/rust/blob/8205e6b75ec656305ac235d4726d2c7a1ddcef14/compiler/rustc_span/src/hygiene.rs#L1397-L1413
Fix documentation for std::panic::update_hook

The equivalent code given in the documentation of `std::panic::update_hook`[^1] does not compile:

* `set_hook` expects a boxed function
* Missing closing delimiter for the closure

[^1]: rust-lang#92649
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-run-make Area: port run-make Makefiles to rmake.rs 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. rollup A PR which is a rollup labels Nov 3, 2025
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Nov 3, 2025

📌 Commit 871692a has been approved by GuillaumeGomez

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 Nov 3, 2025
@bors
Copy link
Collaborator

bors commented Nov 3, 2025

⌛ Testing commit 871692a with merge 1f880d9...

@bors
Copy link
Collaborator

bors commented Nov 3, 2025

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 1f880d9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 3, 2025
@bors bors merged commit 1f880d9 into rust-lang:master Nov 3, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 3, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135099 Add FileCheck annotations to mir-opt/copy-prop e096d769a57570506b50ee1a4ca5b75f45c57026 (link)
#145903 Give correct suggestion for a typo in raw pointers 9b058ff4851713ad962c8612865f51b694494b0f (link)
#147520 Port the remaining SIMD intrinsics to const-eval c3188094cb75407d90fe1309ec224f594e83906d (link)
#148068 rustdoc: Use configured target modifiers when collecting do… 2536bfc814873862f2239462c3878d64442ed322 (link)
#148099 Prepare to move debugger discovery from compiletest to boot… 93f1495d52944a58cb3a3a8835db5cb112346a46 (link)
#148268 rustdoc: fix --emit=dep-info on scraped examples e61cede09ead0fb87f1259b8aee5769ce845bc28 (link)
#148306 Remove double check when decoding ExpnId to avoid races 560590ee8231a0ce8e842b8d1d15859e49115a81 (link)
#148378 Fix documentation for std::panic::update_hook 98f35d43ee4dce69e30b1dcf5fb7fa64789ec0cf (link)

previous master: f5711a55f5

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
Contributor

github-actions bot commented Nov 3, 2025

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 f5711a5 (parent) -> 1f880d9 (this PR)

Test differences

Show 15 test diffs

Stage 1

  • [mir-opt] tests/mir-opt/copy-prop/dead_stores_better.rs: pass -> [missing] (J2)
  • [run-make] tests/run-make/rustdoc-scrape-examples-dep-info: [missing] -> pass (J2)
  • [ui] tests/ui/did_you_mean/c-style-pointer-types.rs: [missing] -> pass (J2)

Stage 2

  • [run-make] tests/run-make/rustdoc-scrape-examples-dep-info: [missing] -> pass (J0)
  • [mir-opt] tests/mir-opt/copy-prop/dead_stores_better.rs: pass -> [missing] (J1)
  • [ui] tests/ui/did_you_mean/c-style-pointer-types.rs: [missing] -> pass (J3)
  • [run-make] tests/run-make/rustdoc-scrape-examples-dep-info: [missing] -> ignore (ignored if target does not support std) (J4)

Additionally, 8 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 1f880d9a1f4a331f1873829401e9d35fcfab2e36 --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. aarch64-apple: 8527.7s -> 10260.3s (+20.3%)
  2. pr-check-1: 1456.2s -> 1710.1s (+17.4%)
  3. x86_64-gnu-gcc: 2812.3s -> 3270.3s (+16.3%)
  4. x86_64-gnu-llvm-21-2: 5170.5s -> 5844.2s (+13.0%)
  5. dist-x86_64-apple: 7967.7s -> 8930.9s (+12.1%)
  6. dist-aarch64-msvc: 5571.9s -> 6241.1s (+12.0%)
  7. dist-i586-gnu-i586-i686-musl: 5570.8s -> 4944.9s (-11.2%)
  8. dist-powerpc64-linux: 5113.9s -> 5682.5s (+11.1%)
  9. dist-ohos-armv7: 3891.6s -> 4316.5s (+10.9%)
  10. x86_64-gnu-nopt: 7488.4s -> 6686.2s (-10.7%)
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 (1f880d9): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results (secondary -3.1%)

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)
-3.1% [-4.1%, -2.0%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 474.205s -> 474.478s (0.06%)
Artifact size: 390.90 MiB -> 390.89 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-run-make Area: port run-make Makefiles to rmake.rs 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 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.