Skip to content

Conversation

@phansch
Copy link
Contributor

@phansch phansch commented Apr 7, 2019

Fixes #3741

@flip1995
Copy link
Member

flip1995 commented Apr 7, 2019

rustfmt run required.

@phansch phansch added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Apr 8, 2019
@phansch phansch added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Apr 8, 2019
@phansch phansch added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties and removed S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Apr 8, 2019
@flip1995
Copy link
Member

flip1995 commented Apr 9, 2019

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Apr 9, 2019

📌 Commit 3ab8038 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Apr 9, 2019

⌛ Testing commit 3ab8038 with merge 37f5c1e...

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

Fixes #3741
@bors
Copy link
Contributor

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
@phansch phansch deleted the 3741 branch April 9, 2019 07:39
phansch added a commit to phansch/rust-clippy that referenced this pull request 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 pull request 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

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants