diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-01-14 18:16:11 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-01-14 18:16:11 +0000 |
| commit | b2ed130ffd9c79de26249a1dfb2a8312d6af12b3 (patch) | |
| tree | 0ff98ea233dc9c6202660fb54abd3a9189c9993b /crates/ra_assists/src/assists/merge_match_arms.rs | |
| parent | 767ff2c13c5b8c21fcbac072ff1a18a39b956408 (diff) | |
| parent | 864434137a3ed17f2a96981780bf7d522e57fd4b (diff) | |
Merge #2841
2841: More UI friendly labels r=kjeremy a=kjeremy
Co-authored-by: Jeremy Kolb <[email protected]>
Diffstat (limited to 'crates/ra_assists/src/assists/merge_match_arms.rs')
| -rw-r--r-- | crates/ra_assists/src/assists/merge_match_arms.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_assists/src/assists/merge_match_arms.rs b/crates/ra_assists/src/assists/merge_match_arms.rs index e9f2cae91..aca391155 100644 --- a/crates/ra_assists/src/assists/merge_match_arms.rs +++ b/crates/ra_assists/src/assists/merge_match_arms.rs | |||
| @@ -52,7 +52,7 @@ pub(crate) fn merge_match_arms(ctx: AssistCtx<impl HirDatabase>) -> Option<Assis | |||
| 52 | 52 | ||
| 53 | let cursor_to_end = current_arm.syntax().text_range().end() - ctx.frange.range.start(); | 53 | let cursor_to_end = current_arm.syntax().text_range().end() - ctx.frange.range.start(); |
| 54 | 54 | ||
| 55 | ctx.add_assist(AssistId("merge_match_arms"), "merge match arms", |edit| { | 55 | ctx.add_assist(AssistId("merge_match_arms"), "Merge match arms", |edit| { |
| 56 | fn contains_placeholder(a: &MatchArm) -> bool { | 56 | fn contains_placeholder(a: &MatchArm) -> bool { |
| 57 | a.pats().any(|x| match x { | 57 | a.pats().any(|x| match x { |
| 58 | ra_syntax::ast::Pat::PlaceholderPat(..) => true, | 58 | ra_syntax::ast::Pat::PlaceholderPat(..) => true, |