Fix fallout from rust-lang/rust PR 60861 #4123
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Centril
changed the title
Centril
force-pushed
the
rustup-let-chains-ast
branch
2 times, most recently
from
11fb3c1 to
f6a5506
Compare
Centril
changed the title
flip1995
added
the
S-blocked
Centril
force-pushed
the
rustup-let-chains-ast
branch
from
f6a5506 to
6ef8b57
Compare
|
Should be ready to go, I think. |
|
Your build has failed. |
|
Let's see if we do better this time. |
|
Formatting error, but it is a little weird (might need to improve on rustfmt side): Diff in /Users/travis/build/rust-lang/rust-clippy/clippy_lints/src/needless_continue.rs at line 210:
F: FnMut(&ast::Block, Option<&ast::Label>),
{
if let ast::ExprKind::While(_, loop_block, label)
- | ast::ExprKind::ForLoop(_, _, loop_block, label)
- | ast::ExprKind::Loop(loop_block, label)
- = &expr.node
+ | ast::ExprKind::ForLoop(_, _, loop_block, label)
+ | ast::ExprKind::Loop(loop_block, label) = &expr.node
{
func(loop_block, label.as_ref());
} |
|
Ugh... I tested this locally with cargo test. :( The contributing guidelines needs some updating as they say nothing about formatting. |
Centril
commented
Jun 24, 2019
| | ast::ExprKind::ForLoop(_, _, loop_block, label) | ||
| | ast::ExprKind::Loop(loop_block, label) | ||
| = &expr.node | ||
| | ast::ExprKind::ForLoop(_, _, loop_block, label) |
There was a problem hiding this comment.
This is truly hideous... cc @topecongiro
There was a problem hiding this comment.
Created rust-lang/rustfmt#3648.
Manishearth
requested changes
Jun 24, 2019
|
@bors r+ |
|
📌 Commit 46a0e54 has been approved by |
bors
added a commit
that referenced
this pull request
Jun 24, 2019
Fix fallout from rust-lang/rust PR 60861 Fixes incoming breakage for unlanded rust-lang/rust#60861. Tests are passing locally; the Rust PR now needs to land first. @Manishearth also says we'll want to split out to a `collapsible_if_let` once we have let-chains working in Rust nightly or something.
|
☀️ Test successful - checks-travis, status-appveyor |
bors
added a commit
that referenced
this pull request
Jun 24, 2019
Replace `unsugar_if` function with `is_if` function cc #4123 (comment) changelog: none r? @Manishearth
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes incoming breakage for unlanded rust-lang/rust#60861.
Tests are passing locally; the Rust PR now needs to land first.
@Manishearth also says we'll want to split out to a
collapsible_if_letonce we have let-chains working in Rust nightly or something.