diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-31 19:12:38 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-31 19:12:38 +0100 |
| commit | 38ab326aac70484cb951fe9389d788d525d41550 (patch) | |
| tree | 0032223efeefca76340fb0a97f6f12d0e432a2a9 /crates/ra_assists/src/handlers/merge_match_arms.rs | |
| parent | 5cade89d730b025082ff2df70aace259951a9ccf (diff) | |
| parent | 98181087984157e27faba0b969e384f3c62c39d5 (diff) | |
Merge #5631
5631: Finalize pattern grammar r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
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)] |