Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the query system to a dedicated crate #70162

Merged
merged 31 commits into from
Mar 28, 2020
Merged

Conversation

cjgillot
Copy link
Contributor

The query system rustc::ty::query is split out into the rustc_query_system crate.

Some commits are unformatted, to ease rebasing.

Based on #67761 and #69910.

r? @Zoxc

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2020
@bors
Copy link
Contributor

bors commented Mar 21, 2020

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

@cjgillot cjgillot force-pushed the split_query branch 2 times, most recently from 3b43778 to 8d22625 Compare March 24, 2020 19:37
@cjgillot
Copy link
Contributor Author

Rebased. Comments from #67761 and #69910 have been applied.

@Zoxc
Copy link
Contributor

Zoxc commented Mar 24, 2020

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion

@bors
Copy link
Contributor

bors commented Mar 24, 2020

⌛ Trying commit 8d22625da2fe03beca659384566a38fdab040351 with merge 0d717b485ce2213e0c429a599935baa71c4286ca...

src/librustc/ty/context.rs Outdated Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Mar 24, 2020

☀️ Try build successful - checks-azure
Build commit: 0d717b485ce2213e0c429a599935baa71c4286ca (0d717b485ce2213e0c429a599935baa71c4286ca)

@Zoxc
Copy link
Contributor

Zoxc commented Mar 24, 2020

@rust-timer build 0d717b485ce2213e0c429a599935baa71c4286ca

@rust-timer
Copy link
Collaborator

Queued 0d717b485ce2213e0c429a599935baa71c4286ca with parent 2dcf54f, future comparison URL.

@cjgillot
Copy link
Contributor Author

Rebased TLS commit removed and review applied.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 0d717b485ce2213e0c429a599935baa71c4286ca, comparison URL.

@bors
Copy link
Contributor

bors commented Mar 25, 2020

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

@cjgillot
Copy link
Contributor Author

Rebased with review applied.

@bors
Copy link
Contributor

bors commented Mar 25, 2020

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

@cjgillot
Copy link
Contributor Author

Rebased.

pub trait HashStableContext {
fn debug_dep_tasks(&self) -> bool;
}
pub trait HashStableContext {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This trait seems useless now =P

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is used by the macro HashStable_Generic for WorkProductId. I can implement it by hand also.

@Zoxc
Copy link
Contributor

Zoxc commented Mar 27, 2020

@bors p=1 r+

@bors
Copy link
Contributor

bors commented Mar 27, 2020

📌 Commit 222d010 has been approved by Zoxc

@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 Mar 27, 2020
@cjgillot
Copy link
Contributor Author

Oops, sorry.

@Zoxc
Copy link
Contributor

Zoxc commented Mar 27, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Mar 27, 2020

📌 Commit 2d7bbda has been approved by Zoxc

@bors
Copy link
Contributor

bors commented Mar 27, 2020

⌛ Testing commit 2d7bbda with merge 0bf7c2a...

@bors
Copy link
Contributor

bors commented Mar 28, 2020

☀️ Test successful - checks-azure
Approved by: Zoxc
Pushing 0bf7c2a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 28, 2020
@bors bors merged commit 0bf7c2a into rust-lang:master Mar 28, 2020
@cjgillot cjgillot deleted the split_query branch March 28, 2020 08:31
@Zoxc
Copy link
Contributor

Zoxc commented Mar 29, 2020

Looks like this regressed incremental benchmarks. There's probably some things that could use #[inline] attributes here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants