Overhaul `rustc_middle::query` by nnethercote · Pull Request #161433 · rust-lang/rust

nnethercote · 2026-08-21T01:03:40Z

Overhaul rustc_middle::query

The file/module structure is a mess. High-level changes:

The vaguely-named mish-mash file plumbing.rs is split across multiple other files.
The vaguely-named inner.rs gains some additions and becomes calls.rs.
system.rs is added.
New file query_api.rs is added. It contains the big macro, which is renamed from define_callbacks to define_query_api.

This is a follow-up to #160843, which did a similar restructuring of rustc_query_impl.

Because `ActiveKeyStatus` wraps `QueryJob`, and `QueryState` is a collection of `ActiveKeyStatus`es.

Because cycles are stored within `QueryWaiter`. Also, rename `Cycle` as `QueryCycle`, to be less generic and match most of the other nearby types.

rustbot · 2026-08-21T01:03:46Z

Zalathar is not on the review rotation at the moment.
They may take a while to respond.

It gains three types from `plumbing.rs` that define the high level query system structures.

Because it's a clearer name. Also move some call-related stuff from `plumbing.rs` to `calls.rs`.

At this point all `plumbing.rs` contains is the `define_callbacks!` macro. Rename that macro as `define_query_api!` because it defines a lot more than just callbacks. And also rename the file to match.

From `mod.rs` to `queries.rs`, the one file that uses it. This leaves `mod.rs` containing only `use` and `mod` items.

Zalathar · 2026-08-26T10:42:45Z

Looks good, thanks.

@bors r+

rust-bors · 2026-08-26T10:42:48Z

📌 Commit 40e321a has been approved by Zalathar

It is now in the queue for this repository.

Kobzol · 2026-08-26T12:21:05Z

@bors try @rust-timer queue

Overhaul `rustc_middle::query`

…uwer Rollup of 7 pull requests Successful merges: - #161433 (Overhaul `rustc_middle::query`) - #158370 (rewrite never type documentation) - #160354 (update `ambiguous_glob_imported_trait` lint explanation and example.) - #161447 (Construct paramenvs from an iterator) - #161707 (pattern_type: make print format match the current syntax) - #161773 (Update WASI targets to wasi-sdk-34) - #161807 (bootstrap: skip StdarchVerify when remote testing is enabled)

rust-bors · 2026-08-26T13:21:30Z

☀️ Try build successful (CI)
Build commit: 370ae5b (370ae5b673fcefc7398bd11b2da161421fac5cb8)
Base parent: 3ffb26f (3ffb26fbf5bf232cf59e314e75ea325973f4f583)

rust-timer · 2026-08-26T14:39:12Z

Finished benchmarking commit (370ae5b): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking means the PR may be perf-sensitive. Consider adding rollup=never if this change is not fit for rolling up.

@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

This perf run didn't have relevant results for this metric.

Cycles

Results (primary 2.1%, secondary 13.5%)

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

	mean	range	count
Regressions ❌ (primary)	2.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	13.5%	[3.3%, 18.3%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.1%	[2.1%, 2.1%]	1

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.1%	[0.0%, 0.2%]	55
Regressions ❌ (secondary)	0.1%	[0.0%, 0.1%]	11
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[0.0%, 0.2%]	55

Bootstrap: 476.994s -> 476.802s (-0.04%)
Artifact size: 402.58 MiB -> 402.59 MiB (0.00%)

@Zalathar

Rollup merge of #161433 - nnethercote:overhaul-rustc_middle-query, r=Zalathar Overhaul `rustc_middle::query` Overhaul `rustc_middle::query` The file/module structure is a mess. High-level changes: - The vaguely-named mish-mash file `plumbing.rs` is split across multiple other files. - The vaguely-named `inner.rs` gains some additions and becomes `calls.rs`. - `system.rs` is added. - New file `query_api.rs` is added. It contains the big macro, which is renamed from `define_callbacks` to `define_query_api`. This is a follow-up to #160843, which did a similar restructuring of `rustc_query_impl`. r? @Zalathar

…uwer Rollup of 7 pull requests Successful merges: - rust-lang/rust#161433 (Overhaul `rustc_middle::query`) - rust-lang/rust#158370 (rewrite never type documentation) - rust-lang/rust#160354 (update `ambiguous_glob_imported_trait` lint explanation and example.) - rust-lang/rust#161447 (Construct paramenvs from an iterator) - rust-lang/rust#161707 (pattern_type: make print format match the current syntax) - rust-lang/rust#161773 (Update WASI targets to wasi-sdk-34) - rust-lang/rust#161807 (bootstrap: skip StdarchVerify when remote testing is enabled)

nnethercote added 4 commits August 21, 2026 08:17

Remove an unused method

e75efba

Reduce visibility of AbsoluteBytePos

a9da690

Move some types from plumbing.rs to job.rs

bb97224

Because `ActiveKeyStatus` wraps `QueryJob`, and `QueryState` is a collection of `ActiveKeyStatus`es.

Move cycle-related things into job.rs

669f21c

Because cycles are stored within `QueryWaiter`. Also, rename `Cycle` as `QueryCycle`, to be less generic and match most of the other nearby types.

rustbot assigned Zalathar Aug 21, 2026

This comment has been minimized.

Sign in to view

Introduce system.rs

1aea26b

It gains three types from `plumbing.rs` that define the high level query system structures.

nnethercote force-pushed the overhaul-rustc_middle-query branch from 372e3b5 to d194c82 Compare August 21, 2026 03:51

This comment has been minimized.

Sign in to view

nnethercote added 3 commits August 21, 2026 17:13

Rename inner.rs as calls.rs

3e45ac6

Because it's a clearer name. Also move some call-related stuff from `plumbing.rs` to `calls.rs`.

Rename plumbing.rs as query_api.rs

1c9dfc9

At this point all `plumbing.rs` contains is the `define_callbacks!` macro. Rename that macro as `define_query_api!` because it defines a lot more than just callbacks. And also rename the file to match.

Move describe_as_module

40e321a

From `mod.rs` to `queries.rs`, the one file that uses it. This leaves `mod.rs` containing only `use` and `mod` items.

nnethercote force-pushed the overhaul-rustc_middle-query branch from d194c82 to 40e321a Compare August 21, 2026 07:13

Zalathar changed the title ~~Overhaul rustc middle query~~ Overhaul rustc_middle::query Aug 26, 2026

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 Aug 26, 2026

JonathanBrouwer mentioned this pull request Aug 26, 2026

Rollup of 7 pull requests #161810

Merged

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 26, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Aug 26, 2026

Auto merge of #161433 - nnethercote:overhaul-rustc_middle-query, r=<try>

370ae5b

Overhaul `rustc_middle::query`

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 26, 2026

rust-bors Bot merged commit 37fcc07 into rust-lang:main Aug 26, 2026
14 checks passed

rustbot added this to the 1.100.0 milestone Aug 26, 2026

nnethercote deleted the overhaul-rustc_middle-query branch August 26, 2026 19:50

Navigation Menu

Uh oh!

Uh oh!

Overhaul `rustc_middle::query` - #161433

Overhaul `rustc_middle::query`#161433
rust-bors[bot] merged 8 commits into
rust-lang:mainfrom
nnethercote:overhaul-rustc_middle-query

nnethercote commented Aug 21, 2026 •

edited by rustbot

Loading

Uh oh!

rustbot commented Aug 21, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

Zalathar commented Aug 26, 2026

Uh oh!

rust-bors Bot commented Aug 26, 2026

Uh oh!

Kobzol commented Aug 26, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented Aug 26, 2026

Uh oh!

This comment has been minimized.

rust-timer commented Aug 26, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

nnethercote commented Aug 21, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Aug 21, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

Zalathar commented Aug 26, 2026

Uh oh!

rust-bors Bot commented Aug 26, 2026

Uh oh!

Kobzol commented Aug 26, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented Aug 26, 2026

Uh oh!

This comment has been minimized.

rust-timer commented Aug 26, 2026

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

nnethercote commented Aug 21, 2026 •

edited by rustbot

Loading