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

Fix breakage due to rust-lang/rust#61988 #4258

Merged
merged 3 commits into from Jul 7, 2019
Merged

Fix breakage due to rust-lang/rust#61988 #4258

merged 3 commits into from Jul 7, 2019

Conversation

ghost
Copy link

@ghost ghost commented Jul 6, 2019

changelog: none

Copy link
Member

@Manishearth Manishearth left a comment

Choose a reason for hiding this comment

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

r=me with desugaring in utils

if let ExprKind::Loop(block, _, LoopSource::While) = &expr.node;
if let Block { expr: Some(expr), .. } = &**block;
if let ExprKind::Match(cond, arms, MatchSource::WhileDesugar) = &expr.node;
if let ExprKind::DropTemps(cond) = &cond.node;
Copy link
Member

Choose a reason for hiding this comment

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

This should be a while_desugar in utils like the if_let_desugar and for_desugar we already have

},
NeverLoopResult::MayContinueMainLoop | NeverLoopResult::Otherwise => (),
}
};
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this ; needed?

@@ -714,6 +702,7 @@ fn loop_desugaring_name(des: hir::LoopSource) -> &'static str {
match des {
hir::LoopSource::ForLoop => "LoopSource::ForLoop",
hir::LoopSource::Loop => "LoopSource::Loop",
hir::LoopSource::While => "LoopSource::WhileDesugar",
Copy link
Contributor

Choose a reason for hiding this comment

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

=> "LoopSource::While",

@Manishearth
Copy link
Member

@bors r+

thanks!

@bors
Copy link
Collaborator

bors commented Jul 6, 2019

📌 Commit adcc02e has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Jul 6, 2019

⌛ Testing commit adcc02e with merge 61204dc...

bors added a commit that referenced this pull request Jul 6, 2019
@tesuji
Copy link
Contributor

tesuji commented Jul 7, 2019

@Manishearth reapprove?

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 7, 2019

📌 Commit c72be0f has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Jul 7, 2019

⌛ Testing commit c72be0f with merge 316da7e...

bors added a commit that referenced this pull request Jul 7, 2019
@bors
Copy link
Collaborator

bors commented Jul 7, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Manishearth
Pushing 316da7e to master...

@bors bors merged commit c72be0f into rust-lang:master Jul 7, 2019
@ghost ghost deleted the fix-breakage-20190706 branch July 7, 2019 05:54
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.

None yet

3 participants