Skip to content

Conversation

@Zalathar
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

tshepang and others added 30 commits January 20, 2026 00:25
This updates the rust-version file to 5c49c4f.
Co-authored-by: Yuki Okushi <[email protected]>
Document experimental RFC process in walkthrough
…ting-docs

Add a new subsection for contributors
This updates the rust-version file to 873d468.
This updates the rust-version file to 0462e8f.
Add missing autodiff run-make tests to the install docs
Refer to debug-logging bootstrap config by its full path.
tshepang and others added 7 commits January 30, 2026 01:05
`QueryStackFrame<I>` is a generic type, and the `I` parameter leaks out
to many other related types. However, it only has two instantiations in
practice:
- `QueryStackFrame<QueryStackFrameExtra>`
- `QueryStackFrame<QueryStackDeferred<'tcx>>`

And most of the places that currently use `QueryStackFrame<I>` are
actually specific to one of the instantiations. This commit removes the
unneeded genericity.

The following types are only ever used with `QueryStackDeferred<'tcx>`:
- QueryMap
- QueryJobInfo
- QueryJob
- QueryWaiter
- QueryLatchInfo
- QueryLatch
- QueryState
- QueryResult
and their `<I>` parameter is changed to `<'tcx>`.

Also, the `QueryContext::QueryInfo` associated type is removed.

`CycleError<I>` and `QueryInfo<I>` are still generic over type, because
they are used with both instantiations.

This required also adding a `<'tcx>` parameter to the traits
`QueryDispatcher` and `QueryContext`, which is annoying but I can't see
how to avoid it.
…ercote

    Reduce generics use in the query system.

In rust-lang#151203 I tried and failed to simplify `QueryStackFrame`. This is an alternative approach. There is no functional change, just tweaking of some names and types to make things clearer. Best reviewed one commit at a time.

r? @oli-obk
Document a safety condition for `TypedArena::alloc_raw_slice`

This method was marked safe in rust-lang@51edc21, because there was no apparent reason for it to be unsafe.

However, I believe that `alloc_raw_slice` does actually impose a significant safety obligation on its caller, because the caller must ensure that each slot in the slice is properly initialized before the arena is dropped.

This is because the arena's Drop impl will unconditionally drop every storage slot that has been handed out, so it has no way to handle slots that were accidentally left uninitialized because a hypothetical caller of `alloc_raw_slice` panicked before initializing them.
…d-parens-labeled-loops, r=Kivooeo

Fix false positive in unused_parens caused by break

Fixes rust-lang#143256
…e, r=jdonszelmann

Fix missing syntax context in lifetime hygiene debug output

`-Zunpretty=expanded,hygiene` was not printing the syntax context for lifetimes. For example, two macro-generated lifetimes `'a` with different hygiene would both print as `/* 2538 */` instead of `/* 2538#0 */` and `/* 2538#1 */`, making it impossible to distinguish them.

This was fixed by changing `print_lifetime` to call `ann_post()` with the full `Ident`, matching how regular identifiers are handled in `print_ident`.

Closes: rust-lang#151797
rustc-dev-guide subtree update

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

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

r? @ghost
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Jan 30, 2026
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-rustc-dev-guide Area: rustc-dev-guide 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 Jan 30, 2026
@Zalathar
Copy link
Member Author

Rollup of everything.

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 30, 2026

📌 Commit 5b54208 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 Jan 30, 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 Jan 30, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 30, 2026

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

@rust-bors rust-bors bot merged commit 7d8ebe3 into rust-lang:main Jan 30, 2026
12 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Jan 30, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#151777 Reduce generics use in the query system. b1aba3c8defebd8b4fa12af985fd175335091d64 (link)
#151808 Document a safety condition for `TypedArena::alloc_raw_slic… 40fafe2980d3ce45fbd6422c516450d709d3b7bb (link)
#151811 Fix false positive in unused_parens caused by break 68ac097c81d43a17ee1056efea0b600fafc71d3a (link)
#151817 Fix missing syntax context in lifetime hygiene debug output 40f82c116346e69514db97d428ad23a16c66a7a1 (link)
#151844 rustc-dev-guide subtree update 4db82c8cab0a20b43a24dd38d8a726edbb0e6454 (link)

previous master: ef2657cbaf

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

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 ef2657c (parent) -> 7d8ebe3 (this PR)

Test differences

Show 32 test diffs

Stage 1

  • [ui] tests/ui/hygiene/unpretty-debug-lifetimes.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lint/unused-parens-labeled-break-issue-143256.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/hygiene/unpretty-debug-lifetimes.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lint/unused-parens-labeled-break-issue-143256.rs: [missing] -> pass (J1)

Additionally, 28 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 7d8ebe3128fc87f3da1ad64240e63ccf07b8f0bd --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-apple: 8111.3s -> 5906.0s (-27.2%)
  2. aarch64-apple: 12499.0s -> 9788.4s (-21.7%)
  3. x86_64-gnu-gcc: 4154.3s -> 3350.4s (-19.4%)
  4. x86_64-gnu-tools: 3731.5s -> 3104.0s (-16.8%)
  5. dist-aarch64-msvc: 5477.0s -> 6397.0s (+16.8%)
  6. x86_64-gnu-llvm-21-2: 5745.1s -> 4843.0s (-15.7%)
  7. x86_64-gnu-stable: 8655.7s -> 7362.7s (-14.9%)
  8. x86_64-rust-for-linux: 3082.4s -> 2646.3s (-14.1%)
  9. pr-check-1: 1879.3s -> 1625.9s (-13.5%)
  10. x86_64-gnu-llvm-20: 4501.2s -> 3930.8s (-12.7%)
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 (7d8ebe3): 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)

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

Cycles

Results (primary 3.0%, 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)
3.0% [3.0%, 3.0%] 1
Regressions ❌
(secondary)
3.1% [2.1%, 4.2%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.0% [3.0%, 3.0%] 1

Binary size

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

Bootstrap: 545.612s -> 475.389s (-12.87%)
Artifact size: 397.86 MiB -> 397.80 MiB (-0.02%)

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

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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 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.