Skip to content

Rename and split some modules in the query system#151977

Closed
Zoxc wants to merge 5 commits into
rust-lang:mainfrom
Zoxc:query-mod-rename
Closed

Rename and split some modules in the query system#151977
Zoxc wants to merge 5 commits into
rust-lang:mainfrom
Zoxc:query-mod-rename

Conversation

@Zoxc

@Zoxc Zoxc commented Feb 2, 2026

Copy link
Copy Markdown
Contributor

This renames rustc_query_system::query::plumbing to execution and splits rustc_middle::query::plumbing into macros and system modules. This reduces the modules named plumbing in the query system from 3 to 1.

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 2, 2026
@Zoxc Zoxc marked this pull request as ready for review February 2, 2026 20:04
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 2, 2026
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 2, 2026
@rustbot

rustbot commented Feb 2, 2026

Copy link
Copy Markdown
Collaborator

r? @mati865

rustbot has assigned @mati865.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@Zoxc

Zoxc commented Feb 2, 2026

Copy link
Copy Markdown
Contributor Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Feb 2, 2026
Rename and split some modules in the query system
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 2, 2026
@Zoxc

Zoxc commented Feb 2, 2026

Copy link
Copy Markdown
Contributor Author

cc @nnethercote @Zalathar

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 2, 2026
@rust-bors

rust-bors Bot commented Feb 2, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 99b5429 failed: CI

@Zalathar

Zalathar commented Feb 2, 2026

Copy link
Copy Markdown
Member

I like the motivation (not having three plumbing modules, and splitting things up a bit), but I'm concerned that these particular names/splits might end up being differently-confusing instead of better.

I'll try to go into more detail later when I have time.

@nnethercote

Copy link
Copy Markdown
Contributor

r? @Zalathar

@rustbot rustbot assigned Zalathar and unassigned mati865 Feb 2, 2026
@Zoxc

Zoxc commented Feb 2, 2026

Copy link
Copy Markdown
Contributor Author

I think the execution one is ok, as that is the main supporting part for execution queries. I'm not too worried about the other being side grades, given that we probably want some reorganization if we merge rustc_query_system anyway.

@Zoxc

Zoxc commented Feb 3, 2026

Copy link
Copy Markdown
Contributor Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Feb 3, 2026
Rename and split some modules in the query system
@rust-bors

rust-bors Bot commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #152006) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-bors

rust-bors Bot commented Feb 3, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 5e694ae (5e694aecf48600c15db5b4d41607abd70813dad6, parent: f60a0f1bcc5a2a6dd8eb2d2021da79b40f5fbae9)

@rust-timer

This comment has been minimized.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (5e694ae): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results (secondary 3.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)
3.0% [2.1%, 4.6%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 470.454s -> 469.646s (-0.17%)
Artifact size: 397.65 MiB -> 397.72 MiB (0.02%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 3, 2026
@Zoxc Zoxc closed this Mar 24, 2026
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 24, 2026
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) 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