Rename HandleCycleError to CycleErrorHandling#151520
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Jan 23, 2026
Merged
Rename HandleCycleError to CycleErrorHandling#151520rust-bors[bot] merged 1 commit intorust-lang:mainfrom
HandleCycleError to CycleErrorHandling#151520rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
A-query-system
Collaborator
|
r? @chenyukang rustbot has assigned @chenyukang. Use |
Zalathar
force-pushed
the
cycle-error-handling
branch
from
9599759 to
ff331d2
Compare
Member
|
sounds reasonable to me r? me @bors r+ rollup |
Contributor
rust-bors
bot
added
S-waiting-on-bors
rust-bors bot
pushed a commit
that referenced
this pull request
Jan 23, 2026
…uwer Rollup of 5 pull requests Successful merges: - #149639 (inline constant localized typeck constraint computation) - #150780 (Add -Z large-data-threshold) - #151520 (Rename `HandleCycleError` to `CycleErrorHandling`) - #151525 (update enzyme, includes an extra patch to fix MacOS builds in CI) - #151527 (Clean up or resolve cfg-related instances of `FIXME(f16_f128)`) r? @ghost
rust-timer
added a commit
that referenced
this pull request
Jan 23, 2026
Rollup merge of #151520 - Zalathar:cycle-error-handling, r=Kivooeo Rename `HandleCycleError` to `CycleErrorHandling` In #101303, the `handle_cycle_error` field was changed from a macro-generated closure to a macro-selected enum variant. But it was not renamed to reflect the fact that it now holds data, not code. Renaming the field and its associated enum to `cycle_error_handling: CycleErrorHandling` should make the relevant code less confusing to read. This PR also moves the enum out of `rustc_query_system::error`, where it was easily confused with diagnostic structs. There should be no change to compiler behaviour.
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
4 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.
In #101303, the
handle_cycle_errorfield was changed from a macro-generated closure to a macro-selected enum variant. But it was not renamed to reflect the fact that it now holds data, not code.Renaming the field and its associated enum to
cycle_error_handling: CycleErrorHandlingshould make the relevant code less confusing to read.This PR also moves the enum out of
rustc_query_system::error, where it was easily confused with diagnostic structs.There should be no change to compiler behaviour.