Move expansion of query macros in rustc_middle to rustc_middle::query #111578
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
|
r? @davidtwco (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-query-system
This comment has been minimized.
This comment has been minimized.
|
The Miri subtree was changed cc @rust-lang/miri |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
cjgillot
reviewed
May 15, 2023
| @@ -1,91 +1,26 @@ | |||
| #![allow(unused_parens)] | |||
|
|
|||
There was a problem hiding this comment.
Can this whole file be made a submodule of rustc_middle::query?
There was a problem hiding this comment.
That's the next PR on my todo list.
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 15, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#108291 (Fix more benchmark test with black_box) - rust-lang#108356 (improve doc test for UnsafeCell::raw_get) - rust-lang#110049 (Don't claim `LocalKey::with` prevents a reference to be sent across threads) - rust-lang#111525 (Stop checking for the absence of something that doesn't exist) - rust-lang#111538 (Make sure the build.rustc version is either the same or 1 apart) - rust-lang#111578 (Move expansion of query macros in rustc_middle to rustc_middle::query) - rust-lang#111584 (Number lexing tweaks) - rust-lang#111587 (Custom MIR: Support `Rvalue::CopyForDeref`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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 moves the expansion of
define_callbacks!anddefine_feedable!fromrustc_middle::ty::querytorustc_middle::query.This means that types used in queries are both imported and used in
rustc_middle::queryinstead of being split between these modules. It also decouplesrustc_middle::ty::queryfurther fromrustc_middlewhich is helpful since we want to moverustc_middle::ty::queryto the query system crates.