Skip to content

Remove cycle_fatal query modifier#153276

Open
Zoxc wants to merge 1 commit intorust-lang:mainfrom
Zoxc:rem-fatal-cycle
Open

Remove cycle_fatal query modifier#153276
Zoxc wants to merge 1 commit intorust-lang:mainfrom
Zoxc:rem-fatal-cycle

Conversation

@Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Mar 2, 2026

This removes the cycle_fatal query modifier as it has no effect on its current users.

r? @nnethercote

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 2, 2026
Copy link
Contributor

@nnethercote nnethercote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please expand the PR description to explain clearly why cycle_fatal has no effect. (I know, because I worked it out two days ago, but to anyone else who comes across this PR it won't be clear, and the change to the comment in plumbing.rs is easy to overlook.)

View changes since this review

// `ty::query::values::Value` can be implemented which produces an appropriate
// placeholder (error) value if the query resulted in a query cycle.
// Queries without a `Value` implementation will raise a fatal error on query
// cycles instead.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#153169 removes this comment.

// `ty::query::values::Value` can be implemented which produces an appropriate
// placeholder (error) value if the query resulted in a query cycle.
// Queries without a `Value` implementation will raise a fatal error on query
// cycles instead.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this will need updating because values::Value is being renamed from_cycle_error::FromCycleError.

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 2, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 2, 2026

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@nnethercote nnethercote added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 2, 2026
@nnethercote
Copy link
Contributor

Blocked on #153169.

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 2, 2026

☔ The latest upstream changes (presumably #153278) made this pull request unmergeable. Please resolve the merge conflicts.

@nnethercote
Copy link
Contributor

Blocked on #153169.

That PR has merged, and this PR is now unblocked.

@nnethercote nnethercote removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Mar 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants