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 ICE in suspicious_else_formatting #3925

Merged
merged 3 commits into from Apr 9, 2019
Merged

Fix ICE in suspicious_else_formatting #3925

merged 3 commits into from Apr 9, 2019

Conversation

@phansch
Copy link
Member

@phansch phansch commented Apr 7, 2019

Fixes #3741

@flip1995
Copy link
Member

@flip1995 flip1995 commented Apr 7, 2019

rustfmt run required.

@flip1995
Copy link
Member

@flip1995 flip1995 commented Apr 9, 2019

Thanks!

@bors r+

@bors
Copy link
Contributor

@bors bors commented Apr 9, 2019

📌 Commit 3ab8038 has been approved by flip1995

@bors
Copy link
Contributor

@bors bors commented Apr 9, 2019

Testing commit 3ab8038 with merge 37f5c1e...

bors added a commit that referenced this issue Apr 9, 2019
Fix ICE in suspicious_else_formatting

Fixes #3741
@bors
Copy link
Contributor

@bors bors commented Apr 9, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing 37f5c1e to master...

@bors bors merged commit 3ab8038 into rust-lang:master Apr 9, 2019
3 checks passed
3 checks passed
@travis-ci[bot]
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@bors
homu Test successful
Details
@phansch phansch deleted the 3741 branch Apr 9, 2019
phansch added a commit to phansch/rust-clippy that referenced this issue Apr 14, 2019
This was causing two different ICEs in rust-lang#3741.
The first was fixed in rust-lang#3925.

The second one is fixed with this commit: We just don't `expect`
anymore. If the snippet doesn't contain an `else`, we stop emitting the
lint because it's not a suspiciously formatted else anyway.
bors added a commit that referenced this issue Apr 14, 2019
Remove `except` in suspicious_else_formatting

96c34e8 contains the fix:

This was causing two different ICEs in #3741. The first was fixed in #3925.

The second one is fixed with this commit: We just don't `expect` anymore.
If the snippet doesn't contain an `else`, we stop emitting the lint because
it's not a suspiciously formatted else anyway.

Unfortunately I wasn't able to provide a minimal test case, but I think it's
fine since it's just ignoring the `None` case now.

And ad27e3f cleans up the lint code to use `if_chain`.

Fixes #3741 once more.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants