Skip to content

Rollup of 3 pull requests#154032

Merged
rust-bors[bot] merged 7 commits intorust-lang:mainfrom
Zalathar:rollup-Aejl3zc
Mar 18, 2026
Merged

Rollup of 3 pull requests#154032
rust-bors[bot] merged 7 commits intorust-lang:mainfrom
Zalathar:rollup-Aejl3zc

Conversation

@Zalathar
Copy link
Member

@Zalathar Zalathar commented Mar 18, 2026

Successful merges:

r? @ghost

Create a similar rollup

bjorn3 and others added 7 commits March 12, 2026 14:14
@bjorn3
Pass Session to make_codegen_backend callback
3f919c0
@bjorn3
Move env/file_depinfo from ParseSess to Session
2199d07
@Zalathar
Move query-stack-frame spans into QueryStackFrame
fbd3b6d 
Code that previously used `QueryStackFrame` now uses `TaggedQueryKey` directly.

Code that previously used `Spanned<QueryStackFrame>` now uses
`QueryStackFrame`, which includes a span.
@Zalathar
Remove unused types UnusedGenericParams and FiniteBitSet
fb850ae 
These types have been unused since polymorphization was removed in
<rust-lang#133883>.
@Zalathar
Rollup merge of rust-lang#153998 - Zalathar:stack-frame, r=nnethercote
f2d25df 
Move query-stack-frame spans into `QueryStackFrame`

- Follow-up to rust-lang#153907 (comment).
---

Code that previously used `QueryStackFrame` now uses `TaggedQueryKey` directly.

Code that previously used `Spanned<QueryStackFrame>` now uses `QueryStackFrame`, which includes a span.

This ends up bringing QueryStackFrame closer to the expectations of the code that actually consumes query cycles, and also avoids the awkward and misleading `respan` calls and `node` field accesses that had been required by `Spanned`.

r? nnethercote
@Zalathar
Rollup merge of rust-lang#153778 - bjorn3:driver_cleanups, r=TaKO8Ki
44c8729 
Couple of driver interface improvements

* Pass Session to `make_codegen_backend` callback. This simplifies some code in miri.
* Move env/file_depinfo from ParseSess to Session. There is no reason it has to be in ParseSess rather than Session.
* Rename hash_untracked_state to track_state to indicate that it isn't just used for hashing state, but also for adding env vars and files to be tracked through the dep info file.
@Zalathar
Rollup merge of rust-lang#154026 - Zalathar:unused, r=mati865
ba84805 
Remove unused types `UnusedGenericParams` and `FiniteBitSet`

- These types have been unused since polymorphization was removed in <rust-lang#133883>.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 18, 2026
@rustbot rustbot added 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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler 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. labels Mar 18, 2026
@Zalathar
Copy link
Member Author

Zalathar commented Mar 18, 2026

Rollup of everything.

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 18, 2026

📌 Commit ba84805 has been approved by Zalathar

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 18, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@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 18, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 18, 2026

☀️ Test successful - CI
Approved by: Zalathar
Duration: 3h 24m 28s
Pushing a3903b1 to main...

@rust-bors rust-bors bot merged commit a3903b1 into rust-lang:main Mar 18, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 18, 2026
This was referenced Mar 18, 2026
Open
Closed
@Zalathar Zalathar deleted the rollup-Aejl3zc branch March 18, 2026 07:34
@github-actions
Copy link
Contributor

github-actions bot commented Mar 18, 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 91775db (parent) -> a3903b1 (this PR)

Test differences

Show 8 test diffs

8 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 a3903b1e6f699ebe3662da79bd4a63bd699a3fea --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-apple-various: 1h 22m -> 1h 50m (+33.5%)
  2. aarch64-apple: 2h 48m -> 3h 18m (+17.6%)
  3. x86_64-gnu-llvm-21-3: 1h 40m -> 1h 57m (+16.9%)
  4. i686-gnu-1: 2h 7m -> 2h 25m (+14.6%)
  5. aarch64-gnu-llvm-21-2: 53m 31s -> 46m 39s (-12.8%)
  6. i686-gnu-nopt-1: 2h 8m -> 2h 23m (+11.6%)
  7. dist-aarch64-msvc: 1h 32m -> 1h 43m (+11.5%)
  8. test-various: 1h 55m -> 2h 7m (+10.4%)
  9. x86_64-gnu-stable: 2h 17m -> 2h 30m (+9.4%)
  10. dist-x86_64-apple: 1h 43m -> 1h 53m (+9.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.

This was referenced Mar 18, 2026
Draft
Open
Open
@rust-bors rust-bors bot mentioned this pull request Mar 18, 2026
Open
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 18, 2026

Finished benchmarking commit (a3903b1): 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.3%, -0.1%] 8
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 2.5%)

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

mean range count
Regressions ❌
(primary)		 2.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.5% [2.5%, 2.5%] 1

Cycles

Results (secondary -2.6%)

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.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) - - 0

Binary size

Results (primary -0.1%, secondary -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
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.1% [-0.2%, -0.0%] 39
Improvements ✅
(secondary)		 -0.1% [-0.1%, -0.0%] 21
All ❌✅ (primary) -0.1% [-0.2%, -0.0%] 39

Bootstrap: 491.471s -> 481.409s (-2.05%)
Artifact size: 396.95 MiB -> 394.92 MiB (-0.51%)

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

Reviewers

No reviews

Assignees

No one assigned

Labels

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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler 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

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Zalathar @rust-timer @rustbot @bjorn3