Move rustc_middle/src/ty/query.rs to rustc_middle/src/query/plumbing.rs#111625
Merged
bors merged 2 commits intorust-lang:masterfrom May 17, 2023
Merged
Move rustc_middle/src/ty/query.rs to rustc_middle/src/query/plumbing.rs#111625bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
Collaborator
|
Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri |
This comment has been minimized.
This comment has been minimized.
71025f7 to
4072964
Compare
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 4072964dfe895c8637c303ad32eaa1623aed4369 has been approved by It is now in the queue for this repository. |
Collaborator
|
☔ The latest upstream changes (presumably #111639) made this pull request unmergeable. Please resolve the merge conflicts. |
4072964 to
54b582a
Compare
Contributor
|
@bors r+ |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 17, 2023
Rollup of 6 pull requests Successful merges: - rust-lang#110930 (Don't expect normalization to succeed in elaborate_drops) - rust-lang#111557 (Revert "Validate resolution for SelfCtor too.") - rust-lang#111565 (rustdoc-json: Add tests for visibility of impls) - rust-lang#111588 (Emits E0599 when meeting `MyTrait::missing_method`) - rust-lang#111625 (Move rustc_middle/src/ty/query.rs to rustc_middle/src/query/plumbing.rs) - rust-lang#111674 (Add missing backslash in HTML string) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
4 tasks
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
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 just keeps the query modules together.
r? @cjgillot