Skip to content

Rollup of 3 pull requests#153812

Merged
rust-bors[bot] merged 6 commits intorust-lang:mainfrom
Zalathar:rollup-aZ9Qsob
Mar 13, 2026
Merged

Rollup of 3 pull requests#153812
rust-bors[bot] merged 6 commits intorust-lang:mainfrom
Zalathar:rollup-aZ9Qsob

Conversation

@Zalathar
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

Enselic and others added 6 commits March 12, 2026 20:30
Also move the FIXME to the source code to avoid duplication, and also
suppress harmless warnings that are annoying when you compile manually.
…youxu

tests/debuginfo/basic-stepping.rs: Add lldb test

Also move the FIXME to the source code to avoid duplication, and also suppress harmless warnings that are annoying when you compile manually.

Takes us one step closer towards closing rust-lang#33013.
Add a `TaggedQueryKey` to identify a query instance

This adds back a `TaggedQueryKey` enum which represents a query kind and the associated key. This is used to replace `QueryStackDeferred` and `QueryStackFrameExtra` and the associated lifting operation for cycle errors

This approach has a couple of benefits:
- We only run description queries when printing the query stack trace in the panic handler
- The unsafe code for `QueryStackDeferred` is removed
- Cycle handles have access to query keys, which may be handy

Some further work could be replacing `QueryStackFrame` with `TaggedQueryKey` as the extra information can be derived from it.
…nslation-test, r=jieyouxu

rustfmt.toml: drop ignore of deleted test
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 13, 2026
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. labels Mar 13, 2026
@Zalathar
Copy link
Member Author

Rollup of everything.

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 13, 2026

📌 Commit 03e3b1e 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 13, 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 13, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 13, 2026

☀️ Test successful - CI
Approved by: Zalathar
Duration: 3h 6m 30s
Pushing eaf4e74 to main...

@rust-bors rust-bors bot merged commit eaf4e74 into rust-lang:main Mar 13, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 13, 2026
@Zalathar Zalathar deleted the rollup-aZ9Qsob branch March 13, 2026 10:38
@github-actions
Copy link
Contributor

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 7ad5c60 (parent) -> eaf4e74 (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard eaf4e7489b6ae3d4ba9a71b720b03b6d58e4f102 --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-x86_64-apple: 1h 52m -> 2h 17m (+22.2%)
  2. tidy: 2m 25s -> 2m 49s (+16.4%)
  3. dist-i586-gnu-i586-i686-musl: 1h 24m -> 1h 36m (+14.5%)
  4. dist-aarch64-apple: 1h 55m -> 1h 39m (-14.1%)
  5. dist-aarch64-msvc: 1h 39m -> 1h 51m (+12.5%)
  6. x86_64-gnu-gcc: 1h 3m -> 1h 10m (+11.3%)
  7. test-various: 1h 53m -> 2h 3m (+9.2%)
  8. aarch64-apple: 2h 40m -> 2h 26m (-8.9%)
  9. aarch64-msvc-1: 2h 2m -> 2h 12m (+8.3%)
  10. x86_64-msvc-ext2: 1h 55m -> 2h 3m (+7.2%)
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 (eaf4e74): 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)
-1.0% [-1.0%, -1.0%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -2.5%, secondary -6.0%)

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)
-2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
-6.0% [-6.0%, -6.0%] 1
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

Cycles

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

Binary size

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

Bootstrap: 488.372s -> 481.06s (-1.50%)
Artifact size: 396.96 MiB -> 395.03 MiB (-0.49%)

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

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants