Skip to content

Avoid duplicated query modifier comments.#153428

Open
nnethercote wants to merge 3 commits intorust-lang:mainfrom
nnethercote:fix-query-comments
Open

Avoid duplicated query modifier comments.#153428
nnethercote wants to merge 3 commits intorust-lang:mainfrom
nnethercote:fix-query-comments

Conversation

@nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Mar 5, 2026 •
edited
Loading

There is currently some duplication.

@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 5, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2026

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 69 candidates
  • Random selection from 15 candidates

@nnethercote nnethercote marked this pull request as draft March 5, 2026 04:38
@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 5, 2026
@nnethercote
Copy link
Contributor Author

nnethercote commented Mar 5, 2026

r? @Zalathar

@rustbot rustbot assigned Zalathar and unassigned JohnTitor Mar 5, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2026

Zalathar is not on the review rotation at the moment.
They may take a while to respond.

@nnethercote nnethercote changed the title Fix query comments Avoid duplicated query modifier comments. Mar 5, 2026
@nnethercote nnethercote marked this pull request as ready for review March 5, 2026 05:05
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 5, 2026
Zalathar
Zalathar reviewed Mar 5, 2026
View reviewed changes
@rust-bors

This comment has been minimized.

Sign in to view
@rustbot

This comment has been minimized.

Sign in to view
@nnethercote
Copy link
Contributor Author

nnethercote commented Mar 5, 2026

I rebased.

@Zalathar
Copy link
Member

Zalathar commented Mar 6, 2026

Regarding the $cache_on_disk_if change, I have a PR proposing to get rid of the explicit cache-on-disk condition and rename the contributor-facing modifier to just cache_on_disk:

@rust-bors

This comment has been minimized.

Sign in to view
@nnethercote
Rename the cycle_delay_bug modifier as cycle_delayed_bug.
cfc9ad7 
Because "delayed bug" is the correct term used everywhere else, e.g.
`Level::DelayedBug`, `DiagCtxtHandle::delayed_bug`.
@nnethercote
Avoid duplicated query modifier comments.
e036cc2 
By removing the ones in `compiler/rustc_middle/src/queries.rs`, and
making `compiler/rustc_middle/src/query/modifiers.rs` the single
source of truth.
@nnethercote
Rename cache_on_disk variables.
52b8040 
To `cache_on_disk_if` to match the query modifier name.
@rustbot
Copy link
Collaborator

rustbot commented Mar 8, 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
Copy link
Contributor Author

nnethercote commented Mar 8, 2026

I rebased.

@nnethercote
Copy link
Contributor Author

nnethercote commented Mar 9, 2026

@Zalathar: any thoughts?

@Zalathar
Copy link
Member

Zalathar commented Mar 10, 2026 •
edited
Loading

I’ve spent hours trying to review this, but I keep getting discouraged by how much energy it would take to argue against the contentious parts.

@nnethercote
Copy link
Contributor Author

nnethercote commented Mar 10, 2026 •
edited
Loading

Huh... I thought this would be uncontroversial. Can you indicate which commits you think are contentious?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Zalathar Zalathar Zalathar left review comments

Assignees

@Zalathar Zalathar

Labels

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nnethercote @rustbot @Zalathar @JohnTitor