Remove QueryCtxt and trait HasDepContext#152704
Open
Zalathar wants to merge 3 commits intorust-lang:mainfrom
Open
Remove QueryCtxt and trait HasDepContext#152704Zalathar wants to merge 3 commits intorust-lang:mainfrom
QueryCtxt and trait HasDepContext#152704Zalathar wants to merge 3 commits intorust-lang:mainfrom
Conversation
rustbot
added
A-query-system
Zoxc
reviewed
Feb 16, 2026
| self.assert_dep_node_not_yet_allocated_in_current_session(tcx.sess, &dep_node, || { | ||
| format!( | ||
| "forcing query with already existing `DepNode`\n\ | ||
| - query-key: {task_arg:?}\n\ |
Contributor
There was a problem hiding this comment.
This won't just print the query key now.
Member
Author
There was a problem hiding this comment.
It will print a tuple of (query_name, key), which seems fine.
nnethercote
approved these changes
Feb 16, 2026
| // Delegate to another function to actually execute the query job. | ||
| let (result, dep_node_index) = if INCR { | ||
| execute_job_incr(query, qcx, qcx.tcx.dep_graph.data().unwrap(), key, dep_node, id) | ||
| execute_job_incr(query, tcx, tcx.dep_graph.data().unwrap(), key, dep_node, id) |
Contributor
There was a problem hiding this comment.
We could now just pass in tcx and get the dep graph data later (in try_load_from_disk_and_cache_in_memory).
Contributor
There was a problem hiding this comment.
That duplicates the unwrap(), so DepGraphData is passed around to indicate incremental is enabled.
| for SemiDynamicQueryDispatcher<'tcx, C, FLAGS> | ||
| { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| f.write_str(self.name()) |
Contributor
There was a problem hiding this comment.
This omits most of the data in the type. Worth a brief comment explaining why?
Contributor
|
r=me with the nits addressed, and merging should wait for #152703. |
nnethercote
added
S-waiting-on-author
This struct was only wrapping `TyCtxt` in order to implement traits that were removed by RUST-152636.
The need for a `HasDepContext` impl on tuples can be avoided by passing the query vtable as part of an argument tuple instead.
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. |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
rustc_query_system#152703 to reduce conflicts.With the
QueryContexttrait removed, wrapper structQueryCtxtno longer serves a purpose and can be replaced withTyCtxteverywhere.After that, the only obstacle to removing trait
HasDepContextisDepGraph::with_task, which uses the trait to allow passing both aTyCtxtand a query vtable through the context argument. But we can achieve the same result by passing the vtable through the other argument instead, in a tuple alongside the query key.r? nnethercote