Skip to content

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented May 15, 2023

This just keeps the query modules together.

r? @cjgillot

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 15, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 15, 2023

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

@Zoxc Zoxc force-pushed the rustc_middle-query-move branch from 71025f7 to 4072964 Compare May 16, 2023 00:12
@cjgillot
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 16, 2023

📌 Commit 4072964dfe895c8637c303ad32eaa1623aed4369 has been approved by cjgillot

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 16, 2023
@bors
Copy link
Collaborator

bors commented May 16, 2023

☔ The latest upstream changes (presumably #111639) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 16, 2023
@Zoxc Zoxc force-pushed the rustc_middle-query-move branch from 4072964 to 54b582a Compare May 17, 2023 00:23
@cjgillot
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 17, 2023

📌 Commit 54b582a has been approved by cjgillot

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 17, 2023
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
@bors bors merged commit 3df5538 into rust-lang:master May 17, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 17, 2023
@Zoxc Zoxc deleted the rustc_middle-query-move branch May 17, 2023 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants