Skip to content

rustc: Remove DepGraph handling from rustc_metadata#44418

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:remove-dep-graph
Sep 10, 2017
Merged

rustc: Remove DepGraph handling from rustc_metadata#44418
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:remove-dep-graph

Conversation

@alexcrichton

Copy link
Copy Markdown
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
Copy Markdown
Member Author

r? @michaelwoerister

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@Mark-Simulacrum

Copy link
Copy Markdown
Member

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

@michaelwoerister

Copy link
Copy Markdown
Member

@bors r+

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

@bors

bors commented Sep 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 304c8de has been approved by michaelwoerister

@kennytm

kennytm commented Sep 9, 2017

Copy link
Copy Markdown
Member

@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
Copy Markdown
Member Author

@bors: r=michaelwoerister

@bors

bors commented Sep 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit fdbbd58 has been approved by michaelwoerister

@kennytm

kennytm commented Sep 9, 2017

Copy link
Copy Markdown
Member

@bors p=1

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=michaelwoerister

@bors

bors commented Sep 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 28e2cd4 has been approved by michaelwoerister

@bors

bors commented Sep 9, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Sep 10, 2017

Copy link
Copy Markdown
Collaborator

💔 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
Copy Markdown
Member Author

@bors: r=michaelwoerister

@bors

bors commented Sep 10, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit d724d03 has been approved by michaelwoerister

@bors

bors commented Sep 10, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Sep 10, 2017

Copy link
Copy Markdown
Collaborator

☀️ 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