Merge query property modules into one #111703
Merged
Conversation
This file contains 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
rustbot
added
A-query-system
This comment has been minimized.
This comment has been minimized.
cjgillot
reviewed
May 18, 2023
| @@ -24,7 +24,7 @@ use rustc_hir::def::DefKind; | |||
| use rustc_hir::def_id::LocalDefId; | |||
| use rustc_interface::interface::Compiler; | |||
| use rustc_interface::{Config, Queries}; | |||
| use rustc_middle::query::query_values::mir_borrowck; | |||
| use rustc_middle::query::queries::mir_borrowck::ProvidedValue; | |||
There was a problem hiding this comment.
This should import the actual type from rustc_middle, not go through query type aliases.
There was a problem hiding this comment.
I think the idea is to avoid relying on the return type, but I'm not sure why.
| value: query_provided::$name<'tcx>, | ||
| ) -> Erase<query_values::$name<'tcx>> { | ||
| value: ProvidedValue<'tcx>, | ||
| ) -> Erase<Value<'tcx>> { |
There was a problem hiding this comment.
This probably deserves an ErasedValue alias too.
There was a problem hiding this comment.
That saves just 1 character though.
| @@ -503,11 +503,11 @@ macro_rules! define_queries { | |||
| pub(super) fn $name<'tcx>( | |||
There was a problem hiding this comment.
Should we attempt to use the same convention in this file?
|
@bors r+ |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
May 18, 2023
Merge query property modules into one This merges all the query modules that defines types into a single module per query with a normal naming convention for type aliases. r? `@cjgillot`
This was referenced May 18, 2023
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 18, 2023
Rollup of 7 pull requests Successful merges: - rust-lang#110986 (Delay a bug when overwriting fed value.) - rust-lang#111054 (Do not recover when parsing stmt in cfg-eval.) - rust-lang#111685 (Fix typo in bootstrap command description) - rust-lang#111686 (Retire is_foreign_item query.) - rust-lang#111695 (Exclude inherent projections from some alias type `match`es) - rust-lang#111703 (Merge query property modules into one) - rust-lang#111707 (Remove unused `impl<T> WorkerLocal<Vec<T>>`.) r? `@ghost` `@rustbot` modify labels: rollup
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
May 20, 2023
Merge some query impl modules into one This merges some modules in `rustc_query_impl` into one per query, analogous to rust-lang#111703. r? `@cjgillot`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This merges all the query modules that defines types into a single module per query with a normal naming convention for type aliases.
r? @cjgillot