Rollup of 5 pull requests#153123
Closed
GuillaumeGomez wants to merge 22 commits intorust-lang:mainfrom
Closed
Conversation
All three of these functions were previously taking `cache` and `execute_query_fn` as separate arguments, but after some other recent simplifications we can just pass `&'tcx QueryVTable<'tcx, C>` instead. This makes it easier to see where `execute_query_fn` is actually called.
This function is tricky to document, and there's more that could be said here, but I don't want to take up too much vertical space, or add too much risk of details becoming inaccurate over time.
It's currently in `dep_node.rs`, along with a blanket impl. Specific impls are in `dep_node_key.rs`. This commit moves the trait and the blanket impl into `dep_node_key.rs`, so everything is in one place.
Because `Key` is extremely generic and hard to search for. Also rename `LocalKey` and `AsLocalKey` similarly, for consistency.
We have two traits governing query keys, for no particular reason. This commit combines them.
Because `Storage` is a vague name that I've never liked.
…em-diag-args, r=jdonszelmann Avoid duplicate `requirement` diag args in `RegionOriginNote` Fixes rust-lang#143872 `RegionOriginNote::WithRequirement` can be emitted multiple times for one diagnostic. I fixed the ICE by scoping per note fluent args in `RegionOriginNote::WithRequirement` with `store_args` and `restore_args`.
…athanBrouwer Migration of `LintDiagnostic` - part 4 Follow-up of: * rust-lang#152933 * rust-lang#153016 * rust-lang#153051 More `LintDiagnostic` items being migrated to `Diagnostic`. Since there is no remaining `emit_node_span_lint` calls, I replaced the method with the code of `emit_diag_node_span_lint`. r? @JonathanBrouwer
…thercote Query key cleanups The first three commits are simple. The last two are a bit more opinionated, see what you think. r? @Zalathar
mailmap: add redddy I changed the email address used for git.
Clean up some code related to `QueryVTable::execute_query_fn` This PR is an assortment of small cleanups to code that interacts with `execute_query_fn` in the query vtable. I also experimented with trying to replace the macro-generated `__rust_end_short_backtrace` functions with a single shared generic function, but I couldn't manage to avoid breaking short backtraces, so I left a note behind to document my attempt. r? nnethercote (or compiler)
rustbot
added
A-meta
Member
Author
|
@bors r+ p=5 rollup=never |
Contributor
rust-bors
bot
added
the
S-waiting-on-bors
rust-bors
bot
removed
the
S-waiting-on-review
Contributor
|
Closing in favour of #153124 |
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
7 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:
requirementdiag args inRegionOriginNote#152651 (Avoid duplicaterequirementdiag args inRegionOriginNote)LintDiagnostic- part 4 #153091 (Migration ofLintDiagnostic- part 4)QueryVTable::execute_query_fn#153120 (Clean up some code related toQueryVTable::execute_query_fn)r? @ghost
Create a similar rollup