Rollup of 3 pull requests - #151935
Closed
JonathanBrouwer wants to merge 6 commits into
Closed
Conversation
This was initially written to be exhaustive, but one more type that can only be type-checked with its containing item has since been added, and was not mentioned. So, make it future-proof by mentioning just the one example. Also, a previous refactor left this less readable.
The explicit `return` was not needed
…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.
typeck_root_def_id: improve doc comment This was initially written to be exhaustive, but one more type that can only be type-checked with its containing item has since been added, and was not mentioned. So, make it future-proof by mentioning just the one example. Also, a previous refactor left this less readable.
ty::context: clean some code a little The explicit `return` was not needed
rustbot
added
A-query-system
Member
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
Contributor
|
☔ The latest upstream changes (presumably #151924) made this pull request unmergeable. Please resolve the merge conflicts. This pull request was unapproved. |
rustbot
removed
the
S-waiting-on-author
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.
Successful merges:
QueryResulttoActiveKeyStatus#151907 (RenameQueryResulttoActiveKeyStatus)r? @ghost
Create a similar rollup