Remove `rustc_query_system` by nnethercote · Pull Request #152703 · rust-lang/rust

nnethercote · 2026-02-16T10:25:39Z

The end point of the PR sequence #152160, #152419, #152516.

It's identical to the one in `rustc_query_impl`.

From `rustc_query_system` to `rustc_middle.` I put it in `graph.rs`, it's one of two files that uses `QuerySideEffect` and seemed as good as anywhere else.

rustbot · 2026-02-16T10:25:42Z

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol, @tshepang

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

rustbot · 2026-02-16T10:25:45Z

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

nnethercote · 2026-02-16T10:26:00Z

cc @oli-obk @cjgillot @Zoxc @petrochenkov

Zalathar · 2026-02-16T10:56:55Z

Those inline snapshot tests in bootstrap are more annoying to bless; there are instructions at:

rust/src/bootstrap/README.md

Lines 222 to 227 in fef627b

    
           ## Testing 
        
           To run bootstrap tests, execute `x test bootstrap`. 
        
           If you want to bless snapshot tests, 
        
           then install `cargo-insta` (`cargo install cargo-insta`), 
        
           and then run `cargo insta review --manifest-path src/bootstrap/Cargo.toml`.

EDIT: Alternatively, you could hand-edit them from 74 crates to 73 crates, as that seems to be the only change needed.

Zalathar · 2026-02-16T11:23:58Z

Once again, let's get the precautionary perf run out of the way early. The failing bootstrap snapshot tests (hopefully) shouldn't matter for this purpose.

@bors try @rust-timer queue

Rm rustc query system

It's plumbing to work around lack of access to `rustc_middle`, which is no longer a problem.

Like the previous commit, it's no longer needed.

At this point module `ich` is the only thing left.

tests/ui-fulldeps/hash-stable-is-unstable.rs

tests/ui-fulldeps/hash-stable-is-unstable.stderr

Zalathar · 2026-02-16T12:42:51Z

r=me with fixed tests and acceptable perf.

rust-bors · 2026-02-16T13:33:50Z

☀️ Try build successful (CI)
Build commit: 66eb71c (66eb71cc32ed95e040a0bd56d729201e48e908d5, parent: fef627b1ebdc7369ddf8a4031a5d25733ac1fb34)

rust-timer · 2026-02-16T14:14:15Z

Finished benchmarking commit (66eb71c): 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 (secondary 2.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)	6.6%	[6.6%, 6.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.5%	[-2.5%, -2.5%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (primary 2.9%, secondary 2.0%)

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

	mean	range	count
Regressions ❌ (primary)	2.9%	[2.9%, 2.9%]	1
Regressions ❌ (secondary)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.9%	[2.9%, 2.9%]	1

Binary size

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

Bootstrap: 481.396s -> 480.438s (-0.20%)
Artifact size: 397.80 MiB -> 397.74 MiB (-0.01%)

src/bootstrap/src/core/builder/tests.rs

nnethercote · 2026-02-16T22:34:50Z

Tests are passing and perf is neutral.

@bors r=Zalathar rollup=maybe

rust-bors · 2026-02-16T22:34:52Z

📌 Commit e9288e7 has been approved by Zalathar

It is now in the queue for this repository.

@Zalathar

… r=Zalathar Remove `rustc_query_system` The end point of the PR sequence rust-lang#152160, rust-lang#152419, rust-lang#152516. r? @Zalathar

Rollup of 6 pull requests Successful merges: - #145399 (Unify wording of resolve error) - #152512 (core: Implement feature `float_exact_integer_constants`) - #152661 (Avoid ICE in From/TryFrom diagnostic under -Znext-solver) - #152703 (Remove `rustc_query_system`) - #152727 (`probe_op` silence ambiguity errors if tainted) - #152728 (Port #![default_lib_allocator] to the new attribute parser)

Rollup of 11 pull requests Successful merges: - #152700 (miri subtree update) - #152715 (`rust-analyzer` subtree update) - #151783 (Implement RFC 3678: Final trait methods) - #152512 (core: Implement feature `float_exact_integer_constants`) - #152661 (Avoid ICE in From/TryFrom diagnostic under -Znext-solver) - #152703 (Remove `rustc_query_system`) - #152206 (misc doc improvements) - #152664 (Fix mis-constructed `file_span` when generating scraped examples) - #152698 (Suppress unstable-trait notes under `-Zforce-unstable-if-unmarked`) - #152727 (`probe_op` silence ambiguity errors if tainted) - #152728 (Port #![default_lib_allocator] to the new attribute parser)

@Zalathar

Rollup merge of #152703 - nnethercote:rm-rustc_query_system, r=Zalathar Remove `rustc_query_system` The end point of the PR sequence #152160, #152419, #152516. r? @Zalathar

nnethercote added 2 commits February 16, 2026 19:58

Remove rustc_query_system README file.

72c7d86

It's identical to the one in `rustc_query_impl`.

Move QuerySideEffect.

8d56cfe

From `rustc_query_system` to `rustc_middle.` I put it in `graph.rs`, it's one of two files that uses `QuerySideEffect` and seemed as good as anywhere else.

rustbot assigned Zalathar Feb 16, 2026

This comment has been minimized.

Sign in to view

Zalathar mentioned this pull request Feb 16, 2026

Remove QueryCtxt and trait HasDepContext #152704

Open

This comment has been minimized.

Sign in to view

rust-bors bot pushed a commit that referenced this pull request Feb 16, 2026

Auto merge of #152703 - nnethercote:rm-rustc_query_system, r=<try>

66eb71c

Rm rustc query system

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

nnethercote changed the title ~~Rm rustc query system~~ Remove rustc_query_system Feb 16, 2026

nnethercote added 3 commits February 16, 2026 22:48

Remove DEP_KIND_DEBUG.

74dd36a

It's plumbing to work around lack of access to `rustc_middle`, which is no longer a problem.

Remove DEP_NODE_DEBUG.

47ed452

Like the previous commit, it's no longer needed.

Remove last remnants of rustc_query_system.

e9288e7

At this point module `ich` is the only thing left.

Zalathar reviewed Feb 16, 2026

View reviewed changes

tests/ui-fulldeps/hash-stable-is-unstable.rs Outdated Show resolved Hide resolved

Zalathar reviewed Feb 16, 2026

View reviewed changes

tests/ui-fulldeps/hash-stable-is-unstable.stderr Outdated Show resolved Hide resolved

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 Feb 16, 2026

nnethercote force-pushed the rm-rustc_query_system branch from 8d086e3 to e9288e7 Compare February 16, 2026 20:26

nnethercote commented Feb 16, 2026

View reviewed changes

src/bootstrap/src/core/builder/tests.rs Show resolved Hide resolved

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 Feb 16, 2026

jhpratt mentioned this pull request Feb 16, 2026

Rollup of 6 pull requests #152736

Closed

Zalathar mentioned this pull request Feb 17, 2026

Rollup of 11 pull requests #152739

Merged

rust-bors bot merged commit e28a33a into rust-lang:main Feb 17, 2026
11 checks passed

rustbot added this to the 1.95.0 milestone Feb 17, 2026

rust-timer added a commit that referenced this pull request Feb 17, 2026

Unrolled build for #152703

8576dfe

Rollup merge of #152703 - nnethercote:rm-rustc_query_system, r=Zalathar Remove `rustc_query_system` The end point of the PR sequence #152160, #152419, #152516. r? @Zalathar

nnethercote deleted the rm-rustc_query_system branch February 17, 2026 09:28

Uh oh!

Conversation

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

Uh oh!

Uh oh!

rustbot commented Feb 16, 2026

Uh oh!

rustbot commented Feb 16, 2026

Uh oh!

nnethercote commented Feb 16, 2026

Uh oh!

This comment has been minimized.

Zalathar commented Feb 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Zalathar commented Feb 16, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

Uh oh!

Zalathar commented Feb 16, 2026

Uh oh!

rust-bors bot commented Feb 16, 2026

Uh oh!

This comment has been minimized.

rust-timer commented Feb 16, 2026

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

nnethercote commented Feb 16, 2026

Uh oh!

rust-bors bot commented Feb 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nnethercote commented Feb 16, 2026 •

edited by rustbot

Loading

Zalathar commented Feb 16, 2026 •

edited

Loading