diff options
| author | Dmitry <[email protected]> | 2020-08-09 14:35:51 +0100 |
|---|---|---|
| committer | Dmitry <[email protected]> | 2020-08-09 14:39:32 +0100 |
| commit | 8068302fefc75440b823f4bf1731a5f347d7c767 (patch) | |
| tree | 251b967182e79bc82a58c2fb208c688f6152df1f /crates/ra_assists/src/handlers/merge_match_arms.rs | |
| parent | 1a43a0f63e0008787225abb6fb2baef97b6a39e0 (diff) | |
| parent | 8a57afe5a4bfab40072a83f7dc4ca560bf860919 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'crates/ra_assists/src/handlers/merge_match_arms.rs')
| -rw-r--r-- | crates/ra_assists/src/handlers/merge_match_arms.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs index 186a1f618..563292282 100644 --- a/crates/ra_assists/src/handlers/merge_match_arms.rs +++ b/crates/ra_assists/src/handlers/merge_match_arms.rs | |||
| @@ -86,7 +86,7 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option | |||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | fn contains_placeholder(a: &ast::MatchArm) -> bool { | 88 | fn contains_placeholder(a: &ast::MatchArm) -> bool { |
| 89 | matches!(a.pat(), Some(ast::Pat::PlaceholderPat(..))) | 89 | matches!(a.pat(), Some(ast::Pat::WildcardPat(..))) |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | #[cfg(test)] | 92 | #[cfg(test)] |