Skip to content

Rollup of 4 pull requests#154862

Merged
rust-bors[bot] merged 8 commits intorust-lang:mainfrom
jhpratt:rollup-mjtl7mx
Apr 6, 2026
Merged

Rollup of 4 pull requests#154862
rust-bors[bot] merged 8 commits intorust-lang:mainfrom
jhpratt:rollup-mjtl7mx

Conversation

@jhpratt
Copy link
Copy Markdown
Member

@jhpratt jhpratt commented Apr 6, 2026

Successful merges:

r? @ghost

Create a similar rollup

nnethercote and others added 8 commits April 3, 2026 15:34
`HashStable::hash_stable` takes a `&mut Hcx`. In contrast,
`ToStableHashKey::to_stable_hash_key` takes a `&Hcx`. But there are
some places where the latter calls the former, and due to the mismatch a
`clone` call is required to get a mutable `StableHashingContext`.

This commit changes `to_stable_hash_key` to instead take a `&mut Hcx`.
This eliminates the mismatch, the need for the clones, and the need for
the `Clone` impls.
…ic, r=jieyouxu,chenyukang

deny-by-default & report in deps `uninhabited_static`

The lint was introduced as a FCW in rust-lang#78324 and landed in rust 1.49.0 (5 years ago); see also rust-lang#74840.

Per the discussion in rust-lang#149518 (comment).

cc @fmease @scottmcm @traviscross
…e-node, r=fee1-dead

fixed generics of crate node ICE

when `note_and_explain_type_err` is called during dyn-compatibility checking, the `body_owner_def_id` can be `CRATE_DEF_ID` because `ObligationCause::dummy()` uses it as a placeholder when there is no real body owner. calling `generics_of `on `CRATE_DEF_ID `caused an ICE because the crate root is a module and modules don't have generics. the fix guards all `generics_of` call sites by checking whether `body_owner_def_id` is `CRATE_DEF_ID` before attempting to look up generics, and skips the type parameter span labeling in that case.

i also added regression test with original ice reproduce

fixes rust-lang#152335
…hingContext, r=fee1-dead

Remove `Clone` impl for `StableHashingContext`.

`HashStable::hash_stable` takes a `&mut Hcx`. In contrast, `ToStableHashKey::to_stable_hash_key` takes a `&Hcx`. But there are some places where the latter calls the former, and due to the mismatch a `clone` call is required to get a mutable `StableHashingContext`.

This commit changes `to_stable_hash_key` to instead take a `&mut Hcx`. This eliminates the mismatch, the need for the clones, and the need for the `Clone` impls.

r? @fee1-dead
…e-149762, r=Kivooeo

add regression test for Redundant memory strores with mut parameters …

Fixs: rust-lang#149762

r? compiler
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Apr 6, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 6, 2026
@jhpratt
Copy link
Copy Markdown
Member Author

jhpratt commented Apr 6, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 6, 2026

📌 Commit b96adb3 has been approved by jhpratt

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 Apr 6, 2026
@rust-bors rust-bors bot mentioned this pull request Apr 6, 2026
@rust-bors

This comment has been minimized.

@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 Apr 6, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 6, 2026

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 10m 21s
Pushing c2efcc4 to main...

@rust-bors rust-bors bot merged commit c2efcc4 into rust-lang:main Apr 6, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Apr 6, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#152853 deny-by-default & report in deps uninhabited_static c16892ad4adb3edc759290615d6fad0263c36043 (link)
#153615 fixed generics of crate node ICE 3942cd97c6f04b2393a32815253b5b8c59988425 (link)
#154744 Remove Clone impl for StableHashingContext. b6aefac2ba913b013bed802990b127dd1f191122 (link)
#154841 add regression test for Redundant memory strores with mut p… 50ba0c4e8fbfd849a987438fcf97dd60b1d37342 (link)

previous master: 9602bda1dd

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
Copy Markdown
Contributor

github-actions bot commented Apr 6, 2026

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 9602bda (parent) -> c2efcc4 (this PR)

Test differences

Show 325 test diffs

Stage 1

  • [assembly] tests/assembly-llvm/riscv-redundant-memory-stores.rs: [missing] -> ignore (only executed when the architecture is riscv64) (J1)
  • [ui] tests/ui/dyn-compatibility/ice-generics-of-crate-root-152335.rs: [missing] -> pass (J1)

Stage 2

  • [assembly] tests/assembly-llvm/riscv-redundant-memory-stores.rs: [missing] -> ignore (only executed when the architecture is riscv64) (J0)
  • [ui] tests/ui/dyn-compatibility/ice-generics-of-crate-root-152335.rs: [missing] -> pass (J2)

Additionally, 321 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 c2efcc4ae006a6b2761cb42572fc9cee0d1ce4af --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: 2h 23m -> 3h 2m (+27.4%)
  2. optional-x86_64-gnu-parallel-frontend: 2h 12m -> 2h 45m (+24.7%)
  3. x86_64-gnu-llvm-21-1: 1h 2m -> 1h 17m (+23.7%)
  4. pr-check-1: 27m 23s -> 33m 39s (+22.9%)
  5. x86_64-rust-for-linux: 46m 11s -> 54m 25s (+17.8%)
  6. i686-gnu-2: 1h 30m -> 1h 43m (+14.5%)
  7. dist-aarch64-apple: 1h 43m -> 1h 57m (+13.5%)
  8. pr-check-2: 38m 38s -> 43m 32s (+12.6%)
  9. aarch64-gnu-debug: 1h 9m -> 1h 17m (+12.4%)
  10. dist-x86_64-apple: 1h 49m -> 1h 36m (-12.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 (c2efcc4): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary 0.8%)

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.5% [2.1%, 4.6%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-3.1%, -2.2%] 3
All ❌✅ (primary) - - 0

Cycles

Results (secondary 5.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)
29.3% [29.3%, 29.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.9% [-3.8%, -2.4%] 3
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 485.742s -> 487.096s (0.28%)
Artifact size: 395.04 MiB -> 395.13 MiB (0.02%)

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

7 participants