Skip to content

Conversation

michaelwoerister
Copy link
Member

r? @Zoxc

Fixes #57692.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 17, 2019
@@ -600,7 +600,7 @@ impl DepGraph {
DepKind::Hir |
DepKind::HirBody |
DepKind::CrateMetadata => {
if dep_node.extract_def_id(tcx).is_none() {
if dep_dep_node.extract_def_id(tcx).is_none() {
Copy link
Contributor

Choose a reason for hiding this comment

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

One could argue, that the parameter name is not very well choosen :/ Maybe one should address as well in a next patch

Copy link
Member Author

Choose a reason for hiding this comment

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

It might make sense to rename dep_dep_node to dep_node_of_dependency or something like that, yeah.

@Zoxc
Copy link
Contributor

Zoxc commented Jan 18, 2019

@bors r+

Do we need to backport this to beta too?

@bors
Copy link
Collaborator

bors commented Jan 18, 2019

📌 Commit 3884cc8 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 Jan 18, 2019
@hellow554
Copy link
Contributor

@Zoxc probably, rustc 1.33.0-beta.1 (d1add9723 2019-01-17) is also affected by this bug. Or one could wait to the next release of beta ;)
Current stable (1.32.0) is not affected 👼

@michaelwoerister
Copy link
Member Author

Yes, let's backport it.

@michaelwoerister michaelwoerister added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 18, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019
Fix typo bug in DepGraph::try_mark_green().

r? @Zoxc

Fixes rust-lang#57692.
Centril added a commit to Centril/rust that referenced this pull request Jan 18, 2019
Fix typo bug in DepGraph::try_mark_green().

r? @Zoxc

Fixes rust-lang#57692.
Centril added a commit to Centril/rust that referenced this pull request Jan 19, 2019
Fix typo bug in DepGraph::try_mark_green().

r? @Zoxc

Fixes rust-lang#57692.
bors added a commit that referenced this pull request Jan 19, 2019
Rollup of 10 pull requests

Successful merges:

 - #57268 (Add a target option "merge-functions", and a corresponding -Z flag (works around #57356))
 - #57476 (Move glob map use to query and get rid of CrateAnalysis)
 - #57501 (High priority resolutions for associated variants)
 - #57573 (Querify `entry_fn`)
 - #57610 (Fix nested `?` matchers)
 - #57634 (Remove an unused function argument)
 - #57653 (Make the contribution doc reference the guide more)
 - #57666 (Generalize `huge-enum.rs` test and expected stderr for more cross platform cases)
 - #57698 (Fix typo bug in DepGraph::try_mark_green().)
 - #57746 (Update README.md)

Failed merges:

r? @ghost
@bors bors merged commit 3884cc8 into rust-lang:master Jan 19, 2019
@pnkfelix pnkfelix added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 24, 2019
@pnkfelix
Copy link
Member

discussed at T-compiler meeting. beta-accepted.

@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 24, 2019
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 24, 2019
bors added a commit that referenced this pull request Jan 24, 2019
[beta] Rollup backports

* #57857: Fix Android CI failing to download SDKs
* #57840: Fix issue 57762
* #57698: Fix typo bug in DepGraph::try_mark_green().

r? @ghost
@jonas-schievink jonas-schievink mentioned this pull request Jun 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.

7 participants