Move more query system code #152419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

rust-bors merged 5 commits into rust-lang:main from nnethercote:mv-more-query-system-code

Feb 12, 2026

Contributor

nnethercote commented Feb 10, 2026

Towards the goal of eliminating rustc_query_system, this commit moves some code from rustc_query_system to rustc_middle and rustc_query_impl, and from rustc_middle to rustc_query_impl.

nnethercote added 2 commits

February 10, 2026 12:23


          Remove out-of-date comment.

e1ed3bf

Keys and values now must be `Copy` due to erasing.


          Derive Clone for QueryLatch.

1c4661c

The derived version is equivalent to the hand-written version.

rustbot assigned Zalathar

rustbot added A-query-system S-waiting-on-review T-compiler labels

Contributor Author

nnethercote commented Feb 10, 2026

cc @cjgillot @Zoxc

Contributor Author

nnethercote commented Feb 10, 2026

Shouldn't affect perf, let's check:

@bors try @rust-timer queue

This comment has been minimized.

Sign in to view

This comment has been minimized.

Sign in to view

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152419 - nnethercote:mv-more-query-system-code, r=<try>

142cef8

Move more query system code

rustbot added the S-waiting-on-perf label

This comment has been minimized.

Sign in to view


          Move parts of rustc_query_system::query::job to rustc_middle::job.

066a935

The latter is a new module.

As well as the code motion, some other changes were required.
- `QueryJobId` methods became free functions so they could move while
  `QueryJobId` itself stayed put. This was so `QueryMap` and
  `QueryJobInfo` could be moved.
- Some visibilities in `rustc_query_system` required changing.
- `collect_active_jobs_from_all_queries` is no longer required in `trait
  QueryContext`.

Contributor

rust-bors bot commented Feb 10, 2026

☀️ Try build successful (CI)
Build commit: 142cef8 (142cef8324cd1d0899762050200d95e5d20c632a, parent: 381e9ef09effbed5f1378a24dc6e461fea35a0e1)

This comment has been minimized.

Sign in to view

Collaborator

rust-timer commented Feb 10, 2026

Finished benchmarking commit (142cef8): comparison URL.

Overall result: ❌✅ regressions and improvements - 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

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

Max RSS (memory usage)

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

Cycles

Results (secondary 1.7%)

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)	5.7%	[2.2%, 12.4%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.0%	[-6.8%, -3.5%]	3
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 509.869s -> 476.022s (-6.64%)
Artifact size: 398.00 MiB -> 397.97 MiB (-0.01%)

rustbot removed the S-waiting-on-perf label

nnethercote added 2 commits

February 10, 2026 18:46


          Move rustc_middle::query::values to rustc_query_impl.

923de04

Because all uses are now in `rustc_query_impl`. This was made possible
by the previous commit. Less code in `rustc_middle`, hooray.


          Move report_cycle.

a34317e

From `rustc_query_system::query::job` to `rustc_query_impl::job`.

nnethercote force-pushed the mv-more-query-system-code branch from c06b080 to a34317e Compare

February 10, 2026 07:46

Member

Zalathar commented Feb 10, 2026

Looks good, thanks.

@bors r+ rollup=maybe

Contributor

rust-bors bot commented Feb 10, 2026

📌 Commit a34317e has been approved by Zalathar

It is now in the queue for this repository.

rust-bors bot added S-waiting-on-bors and removed S-waiting-on-review labels

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#152419 - nnethercote:mv-more-query-system-c…

9700a60

…ode, r=Zalathar

Move more query system code

Towards the goal of eliminating `rustc_query_system`, this commit moves some code from `rustc_query_system` to `rustc_middle` and `rustc_query_impl`, and from `rustc_middle` to `rustc_query_impl`.

r? @Zalathar

JonathanBrouwer mentioned this pull request

Rollup of 10 pull requests #152442

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          Rollup merge of rust-lang#152419 - nnethercote:mv-more-query-system-c…

3d145f3

…ode, r=Zalathar

Move more query system code

Towards the goal of eliminating `rustc_query_system`, this commit moves some code from `rustc_query_system` to `rustc_middle` and `rustc_query_impl`, and from `rustc_middle` to `rustc_query_impl`.

r? @Zalathar

JonathanBrouwer mentioned this pull request

Rollup of 13 pull requests #152451

Closed

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152451 - JonathanBrouwer:rollup-1mjEpG1, r=JonathanBro…

e1f5019

…uwer

Rollup of 13 pull requests

Successful merges:

 - #149937 (try enabling `linker-messages` by default again)
 - #151733 (Use function shims to make sure EII works on apple targets)
 - #152120 (Don't ICE on layout error in vtable computation)
 - #152419 (Move more query system code)
 - #152431 (Restrict the set of things that const stability can be applied to)
 - #152436 (Reenable a GCI+mGCA+GCPT test case)
 - #151142 (Support ADT types in type info reflection)
 - #152021 (Bump tvOS, visionOS and watchOS Aarch64 targets to tier 2)
 - #152146 (mGCA: Add associated const type check)
 - #152372 (style: remove unneeded trailing commas)
 - #152383 (BikeshedGuaranteedNoDrop trait: add comments indicating that it can be observed on stable)
 - #152397 (Update books)
 - #152441 (Fix typos and grammar in top-level and src/doc documentation)

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#152419 - nnethercote:mv-more-query-system-c…

36619a2

…ode, r=Zalathar

Move more query system code

Towards the goal of eliminating `rustc_query_system`, this commit moves some code from `rustc_query_system` to `rustc_middle` and `rustc_query_impl`, and from `rustc_middle` to `rustc_query_impl`.

r? @Zalathar

matthiaskrgr mentioned this pull request

Rollup of 12 pull requests #152454

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#152419 - nnethercote:mv-more-query-system-c…

363db76

…ode, r=Zalathar

Move more query system code

Towards the goal of eliminating `rustc_query_system`, this commit moves some code from `rustc_query_system` to `rustc_middle` and `rustc_query_impl`, and from `rustc_middle` to `rustc_query_impl`.

r? @Zalathar

matthiaskrgr mentioned this pull request

Rollup of 11 pull requests #152473

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#152419 - nnethercote:mv-more-query-system-c…

810aef5

…ode, r=Zalathar

Move more query system code

Towards the goal of eliminating `rustc_query_system`, this commit moves some code from `rustc_query_system` to `rustc_middle` and `rustc_query_impl`, and from `rustc_middle` to `rustc_query_impl`.

r? @Zalathar

matthiaskrgr mentioned this pull request

Rollup of 10 pull requests #152475

Closed

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152475 - matthiaskrgr:rollup-jGnoUNQ, r=matthiaskrgr

01370f7

Rollup of 10 pull requests

Successful merges:

 - #152120 (Don't ICE on layout error in vtable computation)
 - #152419 (Move more query system code)
 - #152431 (Restrict the set of things that const stability can be applied to)
 - #152436 (Reenable a GCI+mGCA+GCPT test case)
 - #152021 (Bump tvOS, visionOS and watchOS Aarch64 targets to tier 2)
 - #152146 (mGCA: Add associated const type check)
 - #152372 (style: remove unneeded trailing commas)
 - #152383 (BikeshedGuaranteedNoDrop trait: add comments indicating that it can be observed on stable)
 - #152397 (Update books)
 - #152441 (Fix typos and grammar in top-level and src/doc documentation)

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#152419 - nnethercote:mv-more-query-system-c…

f1dd4d4

…ode, r=Zalathar

Move more query system code

Towards the goal of eliminating `rustc_query_system`, this commit moves some code from `rustc_query_system` to `rustc_middle` and `rustc_query_impl`, and from `rustc_middle` to `rustc_query_impl`.

r? @Zalathar

This was referenced Feb 11, 2026

Rollup of 9 pull requests #152483

Closed

Rollup of 9 pull requests #152484

Merged

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152484 - matthiaskrgr:rollup-h4u26eb, r=matthiaskrgr

5fdff78

Rollup of 9 pull requests

Successful merges:

 - #152419 (Move more query system code)
 - #152431 (Restrict the set of things that const stability can be applied to)
 - #152436 (Reenable a GCI+mGCA+GCPT test case)
 - #152021 (Bump tvOS, visionOS and watchOS Aarch64 targets to tier 2)
 - #152146 (mGCA: Add associated const type check)
 - #152372 (style: remove unneeded trailing commas)
 - #152383 (BikeshedGuaranteedNoDrop trait: add comments indicating that it can be observed on stable)
 - #152397 (Update books)
 - #152441 (Fix typos and grammar in top-level and src/doc documentation)

rust-bors bot merged commit 2194af9 into rust-lang:main

11 checks passed

rustbot added this to the 1.95.0 milestone

rust-timer added a commit that referenced this pull request


          Unrolled build for #152419

c7f9582

Rollup merge of #152419 - nnethercote:mv-more-query-system-code, r=Zalathar

Move more query system code

Towards the goal of eliminating `rustc_query_system`, this commit moves some code from `rustc_query_system` to `rustc_middle` and `rustc_query_impl`, and from `rustc_middle` to `rustc_query_impl`.

r? @Zalathar

nnethercote mentioned this pull request

Move rustc_query_system code, part 3 #152516

Open

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

Labels

A-query-system S-waiting-on-bors T-compiler