Skip to content

Rollup of 4 pull requests#153576

Merged
rust-bors[bot] merged 8 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-oZYO7KY
Mar 8, 2026
Merged

Rollup of 4 pull requests#153576
rust-bors[bot] merged 8 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-oZYO7KY

Conversation

@JonathanBrouwer
Copy link
Contributor

Successful merges:

r? @ghost

Create a similar rollup

Zalathar and others added 8 commits March 8, 2026 21:53
All of the existing call sites are directly touching `tcx.dep_graph` anyway, so
the extra layer of indirection provides no real benefit.
Currently we use a mix of `C::Key` and `&C::Key` parameters. The former
is more common and a bit nicer, so convert some of the latter. This
results in less converting between the two types, and fewer sigils.
Use `&C::Key` less in queries.

Currently we use a mix of `C::Key` and `&C::Key` parameters. The former is more common and a bit nicer, so convert some of the latter. This results in less converting between the two types, and fewer sigils.
Remove the `rustc_data_structures::assert_matches!` re-exports

- rust-lang#151359
- rust-lang#153462
---

Now that the bootstrap stage0 compiler has been bumped to 1.95, we can remove these temporary re-exports from `rustc_data_structures`, and once again import the `assert_matches!` macros directly from std.
…cote

Replace the `try_mark_green` hook with direct calls to `tcx.dep_graph`

All of the existing call sites are directly touching `tcx.dep_graph` anyway, so the extra layer of indirection provides no real benefit.

There should be no change to compiler behaviour.

r? nnethercote (or compiler)
rendering interpreter OOM as OOM instead of ICE

Fixes rust-lang#149643.
Alternative to rust-lang#153481.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 8, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Mar 8, 2026
@JonathanBrouwer
Copy link
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

📌 Commit f0defb0 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 Mar 8, 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 Mar 8, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 26m 35s
Pushing b41f22d to main...

@rust-bors rust-bors bot merged commit b41f22d into rust-lang:main Mar 8, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 8, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#153464 Use &C::Key less in queries. a181aca71f35ecefa2c5d64269cd96ba83831ab0 (link)
#153553 Remove the rustc_data_structures::assert_matches! re-expo… 82a2b895211a6f661f1d9f07054d3bd2a450be00 (link)
#153561 Replace the try_mark_green hook with direct calls to `tcx… ec1f716981da8f272b6ac7d9d629adb6ad02e70d (link)
#153564 rendering interpreter OOM as OOM instead of ICE a9b334783aeb94060f373dbfd4064ed6f5e7ab55 (link)

previous master: c7b206bba4

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 Mar 8, 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 c7b206b (parent) -> b41f22d (this PR)

Test differences

Show 122 test diffs

122 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard b41f22de2a13a0babd28771e96feef4c309f54aa --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: 2h 54m -> 1h 51m (-36.0%)
  2. dist-aarch64-llvm-mingw: 1h 37m -> 1h 50m (+13.5%)
  3. dist-apple-various: 2h 3m -> 1h 48m (-12.3%)
  4. i686-gnu-nopt-2: 2h 12m -> 2h 26m (+11.0%)
  5. dist-aarch64-msvc: 1h 50m -> 1h 39m (-9.8%)
  6. x86_64-msvc-2: 2h 17m -> 2h 28m (+8.2%)
  7. x86_64-gnu-miri: 1h 27m -> 1h 34m (+8.0%)
  8. dist-x86_64-freebsd: 1h 22m -> 1h 28m (+7.8%)
  9. x86_64-gnu-llvm-20-2: 1h 38m -> 1h 45m (+7.2%)
  10. dist-arm-linux-musl: 1h 31m -> 1h 37m (+6.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 (b41f22d): 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)

Results (primary -0.3%, secondary 1.0%)

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

mean range count
Regressions ❌
(primary)
1.4% [1.4%, 1.4%] 1
Regressions ❌
(secondary)
5.8% [5.8%, 5.8%] 1
Improvements ✅
(primary)
-2.1% [-2.1%, -2.1%] 1
Improvements ✅
(secondary)
-3.8% [-3.8%, -3.8%] 1
All ❌✅ (primary) -0.3% [-2.1%, 1.4%] 2

Cycles

Results (primary -3.2%, secondary -2.4%)

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)
1.5% [1.5%, 1.5%] 1
Improvements ✅
(primary)
-3.2% [-3.2%, -3.2%] 1
Improvements ✅
(secondary)
-4.4% [-4.8%, -4.0%] 2
All ❌✅ (primary) -3.2% [-3.2%, -3.2%] 1

Binary size

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

Bootstrap: 488.157s -> 478.517s (-1.97%)
Artifact size: 395.01 MiB -> 395.02 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants