Skip to content

Rename QueryResult to ActiveKeyStatus #151907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
rust-bors merged 1 commit into from
Feb 1, 2026
Merged

Rename QueryResult to ActiveKeyStatus #151907

rust-bors merged 1 commit into from
Feb 1, 2026
+25 −13

Conversation

@Zalathar
Copy link
Member

@Zalathar Zalathar commented Jan 31, 2026

Long ago, this enum was also used to hold the cached result of a query evaluation that had completed successfully, so its name made some sense.

Nowadays, successful query evaluation is represented by an entry in the query's in-memory cache, which is a separate data structure.

So this enum only deals with “active” query keys, i.e. those for which query evaluation has started, but has not yet completed successfully.

The split between jobs and results was introduced by:

There should be no change to compiler behaviour.

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

rustbot commented Jan 31, 2026

r? @JonathanBrouwer

rustbot has assigned @JonathanBrouwer.
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

@Zalathar
Copy link
Member Author

Zalathar commented Jan 31, 2026

r? nnethercote (or compiler)

@nnethercote
Copy link
Contributor

nnethercote commented Jan 31, 2026

Looks good. The extra comments are nice.

QueryInfo is another one I was looking at that currently has an unhelpful name. It's just a QueryStackFrame (which, when evaluated, contains a QueryStackFrameExtra, which contains an Option<Span>) plus a span. I haven't come up with a better name for it, any ideas?

@bors r+ rollup

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 31, 2026

📌 Commit b993c24 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 31, 2026
@Zalathar
Copy link
Member Author

Zalathar commented Feb 1, 2026

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 1, 2026
@JonathanBrouwer
Rollup merge of rust-lang#151907 - Zalathar:active-key-status, r=nnet…
9220d7d 
…hercote

Rename `QueryResult` to `ActiveKeyStatus`

Long ago, this enum was also used to hold the cached result of a query evaluation that had completed successfully, so its name made some sense.

Nowadays, successful query evaluation is represented by an entry in the query's in-memory cache, which is a separate data structure.

So this enum only deals with “active” query keys, i.e. those for which query evaluation has started, but has not yet completed successfully.

---

The split between jobs and results was introduced by:
-  rust-lang#50102.

---

There should be no change to compiler behaviour.
@JonathanBrouwer JonathanBrouwer mentioned this pull request Feb 1, 2026
Closed
@rust-bors rust-bors bot 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 1, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Feb 1, 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.

@Zalathar
Copy link
Member Author

Zalathar commented Feb 1, 2026

Rebased to fix trivial textual conflict.

@bors r=nnethercote

@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 1, 2026

📌 Commit bf2536a 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 Feb 1, 2026
@Zalathar Zalathar mentioned this pull request Feb 1, 2026
Merged
rust-bors bot pushed a commit that referenced this pull request Feb 1, 2026
@bors
Auto merge of #151937 - Zalathar:rollup-WdVeaxy, r=Zalathar
878374e 
Rollup of 3 pull requests

Successful merges:

 - #151927 (typeck_root_def_id: improve doc comment)
 - #151907 (Rename `QueryResult` to `ActiveKeyStatus`)
 - #151928 (ty::context: clean some code a little)
@rust-bors rust-bors bot merged commit 0b8e961 into rust-lang:main Feb 1, 2026
11 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Feb 1, 2026
rust-timer added a commit that referenced this pull request Feb 1, 2026
@rust-timer
Unrolled build for #151907
bf00b75 
Rollup merge of #151907 - Zalathar:active-key-status, r=nnethercote

Rename `QueryResult` to `ActiveKeyStatus`

Long ago, this enum was also used to hold the cached result of a query evaluation that had completed successfully, so its name made some sense.

Nowadays, successful query evaluation is represented by an entry in the query's in-memory cache, which is a separate data structure.

So this enum only deals with “active” query keys, i.e. those for which query evaluation has started, but has not yet completed successfully.

---

The split between jobs and results was introduced by:
-  #50102.

---

There should be no change to compiler behaviour.
@Zalathar Zalathar deleted the active-key-status branch February 1, 2026 06:52
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

1.95.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Zalathar @rustbot @nnethercote @JonathanBrouwer