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 •
edited
Loading

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

The default CycleErrorHandling::Error mode does the same as cycle_fatal when the default impl of FromCycleError is used. The return types of queries using cycle_fatal however have no specialized FromCycleError impl.

@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
nnethercote
nnethercote requested changes Mar 2, 2026
View reviewed changes
Copy link
Contributor

@nnethercote nnethercote left a comment •
edited by rustbot
Loading

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

@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

nnethercote commented Mar 2, 2026

Blocked on #153169.

@rust-bors

This comment has been minimized.

Sign in to view
@nnethercote
Copy link
Contributor

nnethercote commented Mar 2, 2026

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
@Zoxc Zoxc force-pushed the rem-fatal-cycle branch from 6d117e7 to 8cc80ef Compare March 4, 2026 03:01
@rustbot
Copy link
Collaborator

rustbot commented Mar 4, 2026

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.

nnethercote
nnethercote reviewed Mar 4, 2026
View reviewed changes
Copy link
Contributor

@nnethercote nnethercote left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

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

Can you copy the PR description into the commit message? It's useful to have a good commit message, because you can see that easily when using git blame, and avoids having to work out which PR the commit belonged to. r=me with that.

View changes since this review

compiler/rustc_middle/src/queries.rs Outdated
// placeholder (error) value if the query resulted in a query cycle.
// Queries marked with `cycle_fatal` do not need the latter implementation,
// as they will raise a fatal error on query cycles instead.
// Queries without a `Value` implementation will raise a fatal error on query
Copy link
Contributor

@nnethercote nnethercote Mar 4, 2026

Choose a reason for hiding this comment

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

Suggested change
// Queries without a `Value` implementation will raise a fatal error on query
// Queries without a `FromCycleError` implementation will raise a fatal error on query

@Zoxc
Remove cycle_fatal query modifier
91c7627 
This removes the `cycle_fatal` query modifier as it has no effect on its current users.

The default `CycleErrorHandling::Error` mode does the same as `cycle_fatal` when the default impl of `FromCycleError` is used. The return types of queries using `cycle_fatal` however have no specialized `FromCycleError` impl.
@Zoxc Zoxc force-pushed the rem-fatal-cycle branch from 8cc80ef to 91c7627 Compare March 4, 2026 07:14
@nnethercote
Copy link
Contributor

nnethercote commented Mar 4, 2026

@bors r+ rollup

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 4, 2026

📌 Commit 91c7627 has been approved by nnethercote

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 4, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 4, 2026
@JonathanBrouwer
Rollup merge of rust-lang#153276 - Zoxc:rem-fatal-cycle, r=nnethercote
c72b1a1 
Remove `cycle_fatal` query modifier

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

The default `CycleErrorHandling::Error` mode does the same as `cycle_fatal` when the default impl of `FromCycleError` is used. The return types of queries using `cycle_fatal` however have no specialized `FromCycleError` impl.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Mar 4, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 4, 2026
@JonathanBrouwer
Rollup merge of rust-lang#153276 - Zoxc:rem-fatal-cycle, r=nnethercote
1a0b912 
Remove `cycle_fatal` query modifier

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

The default `CycleErrorHandling::Error` mode does the same as `cycle_fatal` when the default impl of `FromCycleError` is used. The return types of queries using `cycle_fatal` however have no specialized `FromCycleError` impl.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Mar 4, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 4, 2026
@JonathanBrouwer
Rollup merge of rust-lang#153276 - Zoxc:rem-fatal-cycle, r=nnethercote
7301587 
Remove `cycle_fatal` query modifier

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

The default `CycleErrorHandling::Error` mode does the same as `cycle_fatal` when the default impl of `FromCycleError` is used. The return types of queries using `cycle_fatal` however have no specialized `FromCycleError` impl.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Mar 4, 2026
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Mar 4, 2026
@GuillaumeGomez
Rollup merge of rust-lang#153276 - Zoxc:rem-fatal-cycle, r=nnethercote
4410bbd 
Remove `cycle_fatal` query modifier

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

The default `CycleErrorHandling::Error` mode does the same as `cycle_fatal` when the default impl of `FromCycleError` is used. The return types of queries using `cycle_fatal` however have no specialized `FromCycleError` impl.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Mar 4, 2026
Closed
rust-bors bot pushed a commit that referenced this pull request Mar 4, 2026
@bors
Auto merge of #153412 - GuillaumeGomez:rollup-CHFIva5, r=GuillaumeGomez
dbbf1c5 
Rollup of 9 pull requests

Successful merges:

 - #152164 (Lint unused features)
 - #152801 (Refactor WriteBackendMethods a bit)
 - #153317 (Abort after `representability` errors)
 - #153361 (enable `PassMode::Indirect { on_stack: true, .. }` tail call arguments)
 - #153402 (miri subtree update)
 - #153276 (Remove `cycle_fatal` query modifier)
 - #153396 (use `minicore` in some `run-make` tests)
 - #153401 (Migrationg of `LintDiagnostic` - part 7)
 - #153406 (Remove a ping for myself)
rust-bors bot pushed a commit that referenced this pull request Mar 4, 2026
@bors
Auto merge of #153412 - GuillaumeGomez:rollup-CHFIva5, r=GuillaumeGomez
f6d9259 
Rollup of 9 pull requests

Successful merges:

 - #152164 (Lint unused features)
 - #152801 (Refactor WriteBackendMethods a bit)
 - #153317 (Abort after `representability` errors)
 - #153361 (enable `PassMode::Indirect { on_stack: true, .. }` tail call arguments)
 - #153402 (miri subtree update)
 - #153276 (Remove `cycle_fatal` query modifier)
 - #153396 (use `minicore` in some `run-make` tests)
 - #153401 (Migrationg of `LintDiagnostic` - part 7)
 - #153406 (Remove a ping for myself)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 4, 2026
@JonathanBrouwer
Rollup merge of rust-lang#153276 - Zoxc:rem-fatal-cycle, r=nnethercote
fdb18d9 
Remove `cycle_fatal` query modifier

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

The default `CycleErrorHandling::Error` mode does the same as `cycle_fatal` when the default impl of `FromCycleError` is used. The return types of queries using `cycle_fatal` however have no specialized `FromCycleError` impl.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Mar 4, 2026
Open
rust-bors bot pushed a commit that referenced this pull request Mar 4, 2026
@bors
Auto merge of #153416 - JonathanBrouwer:rollup-eezxWTV, r=JonathanBro…
3a03d2a 
…uwer

Rollup of 12 pull requests

Successful merges:

 - #153402 (miri subtree update)
 - #152164 (Lint unused features)
 - #152801 (Refactor WriteBackendMethods a bit)
 - #153196 (Update path separators to be available in const context)
 - #153204 (Add `#[must_use]` attribute to `HashMap` and `HashSet` constructors)
 - #153317 (Abort after `representability` errors)
 - #153276 (Remove `cycle_fatal` query modifier)
 - #153300 (Tweak some of our internal `#[rustc_*]` TEST attributes)
 - #153396 (use `minicore` in some `run-make` tests)
 - #153401 (Migrationg of `LintDiagnostic` - part 7)
 - #153406 (Remove a ping for myself)
 - #153414 (Rename translation -> formatting)
rust-bors bot pushed a commit that referenced this pull request Mar 4, 2026
@bors
Auto merge of #153416 - JonathanBrouwer:rollup-eezxWTV, r=JonathanBro…
e9e6ace 
…uwer

Rollup of 12 pull requests

Successful merges:

 - #153402 (miri subtree update)
 - #152164 (Lint unused features)
 - #152801 (Refactor WriteBackendMethods a bit)
 - #153196 (Update path separators to be available in const context)
 - #153204 (Add `#[must_use]` attribute to `HashMap` and `HashSet` constructors)
 - #153317 (Abort after `representability` errors)
 - #153276 (Remove `cycle_fatal` query modifier)
 - #153300 (Tweak some of our internal `#[rustc_*]` TEST attributes)
 - #153396 (use `minicore` in some `run-make` tests)
 - #153401 (Migrationg of `LintDiagnostic` - part 7)
 - #153406 (Remove a ping for myself)
 - #153414 (Rename translation -> formatting)
rust-bors bot pushed a commit that referenced this pull request Mar 4, 2026
@bors
Auto merge of #153416 - JonathanBrouwer:rollup-eezxWTV, r=JonathanBro…
fa51ff4 
…uwer

Rollup of 12 pull requests

Successful merges:

 - #153402 (miri subtree update)
 - #152164 (Lint unused features)
 - #152801 (Refactor WriteBackendMethods a bit)
 - #153196 (Update path separators to be available in const context)
 - #153204 (Add `#[must_use]` attribute to `HashMap` and `HashSet` constructors)
 - #153317 (Abort after `representability` errors)
 - #153276 (Remove `cycle_fatal` query modifier)
 - #153300 (Tweak some of our internal `#[rustc_*]` TEST attributes)
 - #153396 (use `minicore` in some `run-make` tests)
 - #153401 (Migrationg of `LintDiagnostic` - part 7)
 - #153406 (Remove a ping for myself)
 - #153414 (Rename translation -> formatting)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nnethercote nnethercote nnethercote approved these changes

Assignees

@nnethercote nnethercote

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Zoxc @rustbot @nnethercote