Remove deterministic picking from query cycle handling#152229
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Feb 23, 2026
Merged
Remove deterministic picking from query cycle handling#152229rust-bors[bot] merged 1 commit intorust-lang:mainfrom
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
A-query-system
Contributor
Author
|
cc @nnethercote |
This comment has been minimized.
This comment has been minimized.
petrochenkov
added
S-waiting-on-review
Contributor
|
If the existing approach is indeed non-deterministic, then this looks like a good simplification. |
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Feb 14, 2026
rustc_query_impl: Use `ControlFlow` in `visit_waiters` instead of nested options Noticed when reviewing rust-lang#152229.
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Feb 15, 2026
rustc_query_impl: Use `ControlFlow` in `visit_waiters` instead of nested options Noticed when reviewing rust-lang/rust#152229.
nnethercote
approved these changes
Feb 16, 2026
Contributor
|
Good simplification. The r=me after rebasing and with petrochenkov's comments addressed. |
nnethercote
added
S-waiting-on-author
Contributor
Is it worth adding a comment somewhere that mentions this? Seems like useful information. |
Contributor
|
Ah, wait, you want my opinion? Uuh, well I did almost the same thing in #149849, so it should be ok. |
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
|
@bors r+ |
Contributor
rust-bors
bot
added
S-waiting-on-bors
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 23, 2026
Rollup of 9 pull requests Successful merges: - #152229 (Remove deterministic picking from query cycle handling) - #152970 (extend unpin noalias tests to cover mutable references) - #149783 (stabilize `cfg_select!`) - #151744 (fix refining_impl_trait suggestion with return_type_notation) - #152366 (Add try_shrink_to and try_shrink_to_fit to Vec) - #152640 (Add direct link to rustc-dev-guide in README) - #152963 (Revert "Stabilize `str_as_str`") - #152984 (Remove redundant call to `check_codegen_attributes_extra` in Inliner) - #152987 (Use `HashStable` derive in more places)
rust-timer
added a commit
that referenced
this pull request
Feb 23, 2026
Rollup merge of #152229 - Zoxc:rem-det-pick, r=nnethercote Remove deterministic picking from query cycle handling This removes the deterministic picking of queries from the query cycle handling. The sets we pick from are themselves non-deterministic, making this ineffective. There may be additional entry points to the cycle which we won't discover until after we resume from the cycle handler and run more code.
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
6 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.
This removes the deterministic picking of queries from the query cycle handling. The sets we pick from are themselves non-deterministic, making this ineffective. There may be additional entry points to the cycle which we won't discover until after we resume from the cycle handler and run more code.