Rollup of 9 pull requests#153042
Closed
JonathanBrouwer wants to merge 41 commits intorust-lang:mainfrom
Closed
Conversation
This removes `Suppressed` as a must use cause that could be nested in another (we did not ever return this, but now it's encoded in the types). I also renamed Suppressed->Trvial and added some docs to clear confusion.
…nd `ControlFlow<Uninhabited, T>`
`rustc_queries!` produces two macros: `rustc_with_all_queries` and `rustc_feedable_queries`. The latter is similar to the former but only includes feedable queries. But feedable queries don't need a separate mechanism because we can identify feedable queries within `define_callbacks!` by just looking for the `feedable` modifier. (That's what we do with every modifier other than `feedable`.) This commit removes the special handling and treats feedable queries like everything else. Note that this commit exposes and fixes a latent doc bug. The doc comment for query `explicit_predicates_of` links to `Self::predicates_of`. `explicit_predicates_of` is a feedable query but `predicates_of` is not, so for `TyCtxtFeed` this link is invalid. This wasn't manifesting because `TyCtxtFeed` wasn't getting doc comments attached. It now is, so I changed the link to `TyCtxt::predicates_of`.
Clarify how "ensure" queries check whether they can skip execution The current `check_cache: bool` field in QueryMode is confusing for a few reasons: - It actually refers to checking the *disk cache*, not the in-memory cache. - It gives no indication of what condition is being checked, or why. - It obscures the link between `tcx.ensure_ok()` and `tcx.ensure_done()`, and the actual check. This PR replaces that field with an `EnsureMode` enum that distinguishes between ensure-ok and ensure-done, and leaves the actual check as an implementation detail of the ensure-done mode. This PR also renames `ensure_must_run` → `check_if_ensure_can_skip_execution`, and uses a return struct to more clearly indicate how this helper function gives permission for its caller to skip execution of a query that would otherwise be executed. This also inverts the sense of the returned boolean, which was previously “must run” but is now ”skip execution”. r? nnethercote (or compiler)
rustbot
added
A-attributes
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
Author
|
Trying commonly failed jobs |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 24, 2026
Rollup of 9 pull requests try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
rust-bors
bot
added
S-waiting-on-author
Contributor
|
PR #151558, which is a member of this rollup, was unapproved. |
rustbot
removed
the
S-waiting-on-author
rust-bors
bot
added
the
S-waiting-on-author
Contributor
|
💔 Test for e3268bc failed: CI. Failed jobs:
|
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
9 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:
exitout of PAL #152657 (std: moveexitout of PAL)QueryVTableUnerasedintoGetQueryVTable#152841 (StreamlineQueryVTableUnerasedintoGetQueryVTable)rustc_feedable_queriesanddefine_feedablemacros. #153009 (Removerustc_feedable_queriesanddefine_feedablemacros.)#[register_tool]to the new attribute system #152988 (Port#[register_tool]to the new attribute system)unused_must_uselint improvements #153018 (unused_must_uselint improvements)Failed merges:
r? @ghost
Create a similar rollup