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

rustc: Remove DepGraph handling from rustc_metadata #44418

Merged
merged 1 commit into from
Sep 10, 2017

Conversation

alexcrichton
Copy link
Member

This should now be entirely tracked through queries, so no need to have a
DepGraph in the CStore object any more!

cc #44390

@alexcrichton
Copy link
Member Author

r? @michaelwoerister

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@Mark-Simulacrum
Copy link
Member

@bors p=1 (This feels like it may have performance impact).

@michaelwoerister
Copy link
Member

@bors r+

Thanks, Alex! It's way better this way :)

@bors
Copy link
Contributor

bors commented Sep 9, 2017

📌 Commit 304c8de has been approved by michaelwoerister

@kennytm
Copy link
Member

kennytm commented Sep 9, 2017

@bors p=0

Could not compile rustdoc on PR CI. Please reset the priority to p=1 after that is fixed.

[00:33:42] error[E0061]: this function takes 1 parameter but 2 parameters were supplied
[00:33:42]    --> /checkout/src/librustdoc/core.rs:149:38
[00:33:42]     |
[00:33:42] 149 |     let cstore = Rc::new(CStore::new(&dep_graph, box rustc_trans::LlvmMetadataLoader));
[00:33:42]     |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 parameter
[00:33:42] 
[00:33:44] error[E0061]: this function takes 1 parameter but 2 parameters were supplied
[00:33:44]   --> /checkout/src/librustdoc/test.rs:88:38
[00:33:44]    |
[00:33:44] 88 |     let cstore = Rc::new(CStore::new(&dep_graph, box rustc_trans::LlvmMetadataLoader));
[00:33:44]    |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 parameter
[00:33:44] 
[00:33:44] error[E0061]: this function takes 1 parameter but 2 parameters were supplied
[00:33:44]    --> /checkout/src/librustdoc/test.rs:241:38
[00:33:44]     |
[00:33:44] 241 |     let cstore = Rc::new(CStore::new(&dep_graph, box rustc_trans::LlvmMetadataLoader));
[00:33:44]     |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 parameter
[00:33:44] 
[00:33:44] error: aborting due to 3 previous errors
[00:33:44] 
[00:33:44] error: Could not compile `rustdoc`.

@alexcrichton
Copy link
Member Author

@bors: r=michaelwoerister

@bors
Copy link
Contributor

bors commented Sep 9, 2017

📌 Commit fdbbd58 has been approved by michaelwoerister

@kennytm
Copy link
Member

kennytm commented Sep 9, 2017

@bors p=1

@alexcrichton
Copy link
Member Author

@bors: r=michaelwoerister

@bors
Copy link
Contributor

bors commented Sep 9, 2017

📌 Commit 28e2cd4 has been approved by michaelwoerister

@bors
Copy link
Contributor

bors commented Sep 9, 2017

⌛ Testing commit 28e2cd403912e548edf0cfcc1ad28a2fa934c1d7 with merge 9026e62408040fca85697aad1d3c07cd560bd296...

@bors
Copy link
Contributor

bors commented Sep 10, 2017

💔 Test failed - status-travis

This should now be entirely tracked through queries, so no need to have a
`DepGraph` in the `CStore` object any more!
@alexcrichton
Copy link
Member Author

@bors: r=michaelwoerister

@bors
Copy link
Contributor

bors commented Sep 10, 2017

📌 Commit d724d03 has been approved by michaelwoerister

@bors
Copy link
Contributor

bors commented Sep 10, 2017

⌛ Testing commit d724d03 with merge 34035d2...

bors added a commit that referenced this pull request Sep 10, 2017
rustc: Remove `DepGraph` handling from rustc_metadata

This should now be entirely tracked through queries, so no need to have a
`DepGraph` in the `CStore` object any more!

cc #44390
@bors
Copy link
Contributor

bors commented Sep 10, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing 34035d2 to master...

@bors bors merged commit d724d03 into rust-lang:master Sep 10, 2017
@alexcrichton alexcrichton deleted the remove-dep-graph branch September 10, 2017 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants