Skip to content

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

Merged
bors merged 3 commits into
masterfrom
unknown repository
Jul 7, 2019
Merged

bors merged 3 commits into
masterfrom
unknown repository

Conversation

@ghost

@ghost ghost commented Jul 6, 2019

Copy link
Copy Markdown

changelog: none

@Manishearth Manishearth left a comment

Copy link
Copy Markdown
Member

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

Comment thread clippy_lints/src/loops.rs Outdated
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
Copy Markdown
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

Comment thread clippy_lints/src/loops.rs Outdated
},
NeverLoopResult::MayContinueMainLoop | NeverLoopResult::Otherwise => (),
}
};

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this ; needed?

Comment thread clippy_lints/src/utils/author.rs Outdated
match des {
hir::LoopSource::ForLoop => "LoopSource::ForLoop",
hir::LoopSource::Loop => "LoopSource::Loop",
hir::LoopSource::While => "LoopSource::WhileDesugar",

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

@bors r+

thanks!

@bors

bors commented Jul 6, 2019

Copy link
Copy Markdown
Contributor

📌 Commit adcc02e has been approved by Manishearth

@bors

bors commented Jul 6, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit adcc02e with merge 61204dc...

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

tesuji commented Jul 7, 2019

Copy link
Copy Markdown
Contributor

@Manishearth reapprove?

@Manishearth

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jul 7, 2019

Copy link
Copy Markdown
Contributor

📌 Commit c72be0f has been approved by Manishearth

@bors

bors commented Jul 7, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit c72be0f with merge 316da7e...

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

bors commented Jul 7, 2019

Copy link
Copy Markdown
Contributor

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

3 participants