Some rustc_query_system cleanups
#152023
Open
Some rustc_query_system cleanups
#152023
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-query-system
Zoxc
reviewed
Feb 3, 2026
| @@ -7,7 +7,6 @@ use rustc_errors::codes::*; | |||
| use rustc_errors::{Applicability, MultiSpan, pluralize, struct_span_code_err}; | |||
Contributor
There was a problem hiding this comment.
This module also belongs under the query module, if you feel like moving it.
Contributor
Author
There was a problem hiding this comment.
Do you mean that rustc_middle::values should be rustc_middle::query::values?
This comment has been minimized.
This comment has been minimized.
Zalathar
reviewed
Feb 3, 2026
| } | ||
| } | ||
|
|
||
| impl<Key, Value> Cache<Key, Value> { |
Member
There was a problem hiding this comment.
For future work, note that this Cache type appears to only be used by trait selection/evaluation, and has nothing to do with query caching at all!
It should probably be moved into rustc_middle::traits.
Contributor
Author
There was a problem hiding this comment.
I have a draft change doing exactly that, and I even considered including it in this PR!
I think the reason it's in rustc_query_system is because it uses WithDepNode, and a lot of depnode-related stuff is in that crate. But I think it makes sense to place things more by where they are used (in rustc_middle) rather than by conceptual categorization.
I'll include it in a future PR :)
Contributor
|
r=me with Zoxc's comment resolved |
petrochenkov
reviewed
Feb 3, 2026
| query_system_query_overflow = queries overflow the depth limit! | ||
| .help = consider increasing the recursion limit by adding a `#![recursion_limit = "{$suggested_limit}"]` attribute to your crate (`{$crate_name}`) | ||
Contributor
Author
There was a problem hiding this comment.
Ok, I'll wait for that to merge.
Contributor
Author
There was a problem hiding this comment.
Thanks, that was helpful to know about that in advance before rebasing.
It's a tiny module with one trait and a default impl. It's not used in `rustc_query_system`; all uses and non-default impls are in `rustc_middle` and `rustc_query_impl`. This commit moves it into `rustc_middle`, which makes things simpler overall.
It's a better place for it, because it relates to queries.
They are defined in `rustc_query_system` but used in `rustc_query_impl`. This is very much *not* how things are supposed to be done; I suspect someone got lazy and took a shortcut at some point. This commit moves the errors into `rustc_query_impl`. This requires more lines of code to give `rustc_query_impl` an errors module, but it's worthwhile to do things in the normal way instead of a weird exceptional way.
It's unused. And it's nice to remove this function that didn't behave like normal `clear` does, as the comment explained.
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Contributor
Author
|
I rebased over #152041, and added a new commit to move |
Contributor
Author
|
@bors r=cjgillot |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Small improvements I found while looking closely at
rustc_query_system. Best reviewed one commit at a time.r? @cjgillot