Skip to content

Rollup of 17 pull requests #144934

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 107 commits into from
Aug 5, 2025
Merged

Rollup of 17 pull requests #144934

merged 107 commits into from
Aug 5, 2025

Conversation

samueltardieu
Copy link
Member

@samueltardieu samueltardieu commented Aug 5, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

joshka and others added 30 commits July 2, 2025 22:12
- All settings are now phrased in the imperative form stating what the
  setting does rather than talking about what it controls. (E.g.:
  "Show `Debug` action." instead of "Whether to show `Debug` action"
- Categories are now displayed in title case
- Categories are now sorted lexicographically
- General category is removed (and all the settings are moved to the top
  level)
- Language for a few descriptions is made a bit less ambiguous
And add assert_eq, assert_ne, assert_matches support

Input:

```rust
pub fn $0foo(x: bool) {
    debug_assert!(x);
}
```

Old:

```rust
/// .
///
/// # Panics
///
/// Panics if .
pub fn foo(x: bool) {
    debug_assert!(x);
}
```

This PR fixes:

```rust
/// .
pub fn foo(x: bool) {
    debug_assert!(x);
}
```
- this removes one external dependency, mdbook-toc
- this steals code from rustc book
…-gen

Fix gen panics doc template for debug_assert
fix: Do not require all rename definitions to be renameable
Use GH app for authenticating sync PRs
…l-snippet

fix: In generate_mut_trait_impl, don't add a tabstop if the client does not support snippets
Improve settings tree title and descriptions
… `impl Trait`, collect only the bounds of this projection

It used to collect the bounds of them all.
…hints

fix: When displaying a projection into a type parameter that has bounds as `impl Trait`, collect only the bounds of this projection
…le_struct_to_named_struct

Migrate `convert_tuple_struct_to_named_struct` assist to use `SyntaxEditor`
…_alias_to_syntax_editor

Migrate `inline_type_alias` assist to use `syntax_editor`
Reorganize proc-macro-srv more, add `--format` and `--version` args
coverage: Various small cleanups

This PR is a collection of small coverage-related changes that I accumulated while working towards other coverage improvements.

Each change should hopefully be fairly straightforward.
`rust-analyzer` subtree update

Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@8d75311.

Created using https://github.com/rust-lang/josh-sync.

r? `@ghost`
Add `InterpCx::project_fields`

I was hoping for a much bigger improvement and this is lukewarm at best ^^'

Still, I think this makes sense.
…enton

Delete `tests/ui/threads-sendsync/tcp-stress.rs`

This stress test was originally introduced in 65cca4b to detect a UAF in `libuv` (see rust-lang#12823), but we no longer use `libuv`, so remove this test as it no longer serves its original purpose, and is causing flaky timeout failures.

Closes rust-lang#144878 (by removing the test).

r? libs
rustc-dev-guide subtree update

Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@1263fc2.

Created using https://github.com/rust-lang/josh-sync.

r? ``@ghost``
Dont print arg span in MIR dump for tail call

r? WaffleLapkin

This makes the MIR dump for tail call terminators consistent w/ regular calls.
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Aug 5, 2025
@samueltardieu
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Aug 5, 2025

📌 Commit 5c11681 has been approved by samueltardieu

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 Aug 5, 2025
@bors
Copy link
Collaborator

bors commented Aug 5, 2025

⌛ Testing commit 5c11681 with merge 0f35336...

@bors
Copy link
Collaborator

bors commented Aug 5, 2025

☀️ Test successful - checks-actions
Approved by: samueltardieu
Pushing 0f35336 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 5, 2025
@bors bors merged commit 0f35336 into rust-lang:master Aug 5, 2025
11 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Aug 5, 2025
Copy link
Contributor

github-actions bot commented Aug 5, 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 0060d5a (parent) -> 0f35336 (this PR)

Test differences

Show 137 test diffs

Stage 1

  • [coverage-map] tests/coverage/branch/no-mir-spans.rs: pass -> [missing] (J0)
  • [coverage-run] tests/coverage/branch/no-mir-spans.rs: ignore (ignored when the profiler runtime is not available) -> [missing] (J0)
  • [ui] tests/ui/associated-consts/constant-trait-item-reference-selection-26095.rs: [missing] -> pass (J0)
  • [ui] tests/ui/attributes/cold-attribute-application-54044.rs: [missing] -> pass (J0)
  • [ui] tests/ui/autoref-autoderef/autoderef-vec-box-fn-36786.rs: [missing] -> pass (J0)
  • [ui] tests/ui/borrowck/borrow-checker-lifetime-error-46471.rs: [missing] -> pass (J0)
  • [ui] tests/ui/borrowck/string-borrowing-pattern-matching-11869.rs: [missing] -> pass (J0)
  • [ui] tests/ui/cast/u8-to-char-cast-9918.rs: [missing] -> pass (J0)
  • [ui] tests/ui/codegen/llvm-miscompile-metadata-invalidation-36023.rs: [missing] -> pass (J0)
  • [ui] tests/ui/coherence/impl-coherence-error-for-undefined-type-18058.rs: [missing] -> pass (J0)
  • [ui] tests/ui/const-generics/trait-resolution-error-with-const-generics-77919.rs: [missing] -> pass (J0)
  • [ui] tests/ui/drop/destructor-run-for-expression-4734.rs: [missing] -> pass (J0)
  • [ui] tests/ui/explicit-tail-calls/callee_is_ref.rs: [missing] -> pass (J0)
  • [ui] tests/ui/explicit-tail-calls/callee_is_weird.rs: [missing] -> pass (J0)
  • [ui] tests/ui/generics/unnecessary-path-disambiguator-36116.rs: [missing] -> pass (J0)
  • [ui] tests/ui/inference/collection-type-copy-behavior-12909.rs: [missing] -> pass (J0)
  • [ui] tests/ui/issues/issue-15673.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-18058.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-18685.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-22434.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-25185.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-26093.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-26095.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-32655.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-32995-2.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-36023.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-36116.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-36786-resolve-call.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-46471-1.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-4734.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-48276.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-54044.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-7519-match-unit-in-arg.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-77919.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-9918.rs: pass -> [missing] (J0)
  • [ui] tests/ui/iterators/iterator-type-inference-sum-15673.rs: [missing] -> pass (J0)
  • [ui] tests/ui/linking/rlib-to-dylib-native-deps-inclusion-25185.rs: [missing] -> pass (J0)
  • [ui] tests/ui/macros/invalid-assignment-in-macro-26093.rs: [missing] -> pass (J0)
  • [ui] tests/ui/pattern/unit-pattern-matching-in-function-argument-7519.rs: [missing] -> pass (J0)
  • [ui] tests/ui/threads-sendsync/tcp-stress.rs: pass -> [missing] (J0)
  • [ui] tests/ui/traits/const-traits/conditionally-const-in-anon-const.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/const-traits/conditionally-const-in-struct-args.rs: pass -> [missing] (J0)
  • [ui] tests/ui/type-alias/missing-associated-type-in-trait-object-22434.rs: [missing] -> pass (J0)
  • [ui] tests/ui/typeck/incorrect-self-type-in-trait-impl-48276.rs: [missing] -> pass (J0)
  • [ui] tests/ui/typeck/parenthesized-type-parameters-error-32995.rs: [missing] -> pass (J0)
  • [ui] tests/ui/unboxed-closures/self-param-space-conflict-in-unboxed-closure-18685.rs: [missing] -> pass (J0)
  • html::layout::tests::test_may_remove_crossorigin: [missing] -> pass (J4)

Stage 2

  • [ui] tests/ui/associated-consts/constant-trait-item-reference-selection-26095.rs: [missing] -> pass (J1)
  • [ui] tests/ui/attributes/cold-attribute-application-54044.rs: [missing] -> pass (J1)
  • [ui] tests/ui/autoref-autoderef/autoderef-vec-box-fn-36786.rs: [missing] -> pass (J1)
  • [ui] tests/ui/borrowck/borrow-checker-lifetime-error-46471.rs: [missing] -> pass (J1)
  • [ui] tests/ui/borrowck/string-borrowing-pattern-matching-11869.rs: [missing] -> pass (J1)
  • [ui] tests/ui/cast/u8-to-char-cast-9918.rs: [missing] -> pass (J1)
  • [ui] tests/ui/codegen/llvm-miscompile-metadata-invalidation-36023.rs: [missing] -> pass (J1)
  • [ui] tests/ui/coherence/impl-coherence-error-for-undefined-type-18058.rs: [missing] -> pass (J1)
  • [ui] tests/ui/const-generics/trait-resolution-error-with-const-generics-77919.rs: [missing] -> pass (J1)
  • [ui] tests/ui/drop/destructor-run-for-expression-4734.rs: [missing] -> pass (J1)
  • [ui] tests/ui/explicit-tail-calls/callee_is_ref.rs: [missing] -> pass (J1)
  • [ui] tests/ui/explicit-tail-calls/callee_is_weird.rs: [missing] -> pass (J1)
  • [ui] tests/ui/generics/unnecessary-path-disambiguator-36116.rs: [missing] -> pass (J1)
  • [ui] tests/ui/inference/collection-type-copy-behavior-12909.rs: [missing] -> pass (J1)
  • [ui] tests/ui/issues/issue-15673.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-18058.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-18685.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-22434.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-25185.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-26093.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-26095.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-32655.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-32995-2.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-36023.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-36116.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-36786-resolve-call.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-46471-1.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-4734.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-48276.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-54044.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-7519-match-unit-in-arg.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-77919.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-9918.rs: pass -> [missing] (J1)
  • [ui] tests/ui/iterators/iterator-type-inference-sum-15673.rs: [missing] -> pass (J1)
  • [ui] tests/ui/linking/rlib-to-dylib-native-deps-inclusion-25185.rs: [missing] -> pass (J1)
  • [ui] tests/ui/macros/invalid-assignment-in-macro-26093.rs: [missing] -> pass (J1)
  • [ui] tests/ui/pattern/unit-pattern-matching-in-function-argument-7519.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/const-traits/conditionally-const-in-anon-const.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/const-traits/conditionally-const-in-struct-args.rs: pass -> [missing] (J1)
  • [ui] tests/ui/type-alias/missing-associated-type-in-trait-object-22434.rs: [missing] -> pass (J1)
  • [ui] tests/ui/typeck/incorrect-self-type-in-trait-impl-48276.rs: [missing] -> pass (J1)
  • [ui] tests/ui/typeck/parenthesized-type-parameters-error-32995.rs: [missing] -> pass (J1)
  • [ui] tests/ui/unboxed-closures/self-param-space-conflict-in-unboxed-closure-18685.rs: [missing] -> pass (J1)
  • [coverage-run] tests/coverage/branch/no-mir-spans.rs: ignore (ignored when cross-compiling) -> [missing] (J2)
  • [ui] tests/ui/threads-sendsync/tcp-stress.rs: pass -> [missing] (J3)
  • [ui] tests/ui/threads-sendsync/tcp-stress.rs: ignore (ignored when the operating system is android (needs extra network permissions)) -> [missing] (J5)
  • [coverage-run] tests/coverage/branch/no-mir-spans.rs: pass -> [missing] (J6)
  • [coverage-run] tests/coverage/branch/no-mir-spans.rs: ignore (ignored when the profiler runtime is not available) -> [missing] (J7)
  • [coverage-map] tests/coverage/branch/no-mir-spans.rs: pass -> [missing] (J8)

Additionally, 41 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 0f353363965ebf05e0757f7679c800b39c51a07e --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-apple-2: 3863.2s -> 6524.5s (68.9%)
  2. dist-aarch64-linux: 5590.5s -> 8645.7s (54.6%)
  3. pr-check-2: 2242.1s -> 2884.4s (28.6%)
  4. aarch64-gnu-debug: 3603.6s -> 4344.5s (20.6%)
  5. x86_64-gnu-llvm-19: 2528.9s -> 2930.5s (15.9%)
  6. pr-check-1: 1525.6s -> 1760.0s (15.4%)
  7. i686-gnu-2: 5328.3s -> 6103.4s (14.5%)
  8. x86_64-rust-for-linux: 2633.7s -> 2945.8s (11.8%)
  9. i686-gnu-1: 7202.0s -> 8033.5s (11.5%)
  10. i686-gnu-nopt-1: 7089.2s -> 7900.4s (11.4%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#144467 rustdoc template font links only emit crossorigin when ne… 3696338d7016f9f68717f961955ba5590e745746 (link)
#144548 Rehome 21 tests/ui/issues/ tests to other subdirectories … f6c4cc10a4f98d31c68771c6ca413e156df49b71 (link)
#144741 fix: Error on illegal [const]s inside blocks within legal… a4fed8d818aa87103e6a4ace70fd9931331e0b72 (link)
#144776 Printer cleanups aff7836172f3efa6cf7aa5533e601781135061a9 (link)
#144779 Implement debugging output of the bootstrap Step graph into… 4a9b0450a48fd66ae87548a141de865b1c6bf53e (link)
#144813 Add a tidy check to prevent adding UI tests directly under … a76b5273185ce75fc742c6a1b08abdfe4f4f3049 (link)
#144817 Properly reject tail calls to &FnPtr or &FnDef f76883f5893dfbad12a9687d3ebee1b896a9560d (link)
#144852 Rename rust_panic_without_hook to resume_unwind b22fdd10cb10cb5883ee4981220cd9a65f255549 (link)
#144866 Remove SHOULD_EMIT_LINTS in favor of should_emit ef311a472e35605ba9a815b6a6e09f31f76fa8d7 (link)
#144867 Use as_array in PartialEq for arrays 30da9611b077fc32f7d37240d671ee7d7474c1ca (link)
#144872 Document Poisoning in LazyCell and LazyLock 69ec5cbac087fc16fce9e2c20fd59770a3ebbc8b (link)
#144877 coverage: Various small cleanups 5a4b5fdcd2ac38ae0cf1ee3e2b39e092cd61f14f (link)
#144887 rust-analyzer subtree update 8befa7b19ef2cd4d9789e9b135e9d4691366ea14 (link)
#144890 Add InterpCx::project_fields 85d55f574534b9166fdc8822a839eaadb58b15a2 (link)
#144894 Delete tests/ui/threads-sendsync/tcp-stress.rs fe9e86795a32a0ab5eb0976945cbb471f0107089 (link)
#144905 rustc-dev-guide subtree update 1dc6c6ada53aca7016b8623803065713580d6b21 (link)
#144920 Dont print arg span in MIR dump for tail call e4196448a7eb1241f1f8f1fd93b160c14f6ede20 (link)

previous master: 0060d5a2a8

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

@samueltardieu samueltardieu deleted the rollup-25jvb9g branch August 5, 2025 05:13
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0f35336): 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.1% [0.1%, 0.2%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -1.2%, secondary -0.7%)

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

mean range count
Regressions ❌
(primary)
3.1% [3.1%, 3.1%] 1
Regressions ❌
(secondary)
2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)
-3.4% [-4.6%, -2.2%] 2
Improvements ✅
(secondary)
-4.1% [-4.1%, -4.1%] 1
All ❌✅ (primary) -1.2% [-4.6%, 3.1%] 3

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

Binary size

Results (primary -0.1%)

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

mean range count
Regressions ❌
(primary)
0.1% [0.1%, 0.1%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.6%, -0.0%] 8
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.1% [-0.6%, 0.1%] 10

Bootstrap: 466.337s -> 468.338s (0.43%)
Artifact size: 376.97 MiB -> 376.93 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.