diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-27 08:53:56 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-10-27 08:53:56 +0000 |
commit | c185f74fc9280dba1433ce53c9886ce524308c3d (patch) | |
tree | 3f470ea1e7f737e3d846eb77b006dc75023652ec /crates/ra_assists/src/assists/merge_match_arms.rs | |
parent | b85f6d522af7630ab227762076a9fbf75de502de (diff) | |
parent | 8118dc1bb9bc63670f72965e5115daa96e8c72fd (diff) |
Merge #2084
2084: use more consistent naming r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[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 f5ddd7159..b0c4ee78b 100644 --- a/crates/ra_assists/src/assists/merge_match_arms.rs +++ b/crates/ra_assists/src/assists/merge_match_arms.rs | |||
@@ -27,7 +27,7 @@ use ra_syntax::ast::{AstNode, MatchArm}; | |||
27 | // } | 27 | // } |
28 | // ``` | 28 | // ``` |
29 | pub(crate) fn merge_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> { | 29 | pub(crate) fn merge_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> { |
30 | let current_arm = ctx.node_at_offset::<MatchArm>()?; | 30 | let current_arm = ctx.find_node_at_offset::<MatchArm>()?; |
31 | 31 | ||
32 | // We check if the following match arm matches this one. We could, but don't, | 32 | // We check if the following match arm matches this one. We could, but don't, |
33 | // compare to the previous match arm as well. | 33 | // compare to the previous match arm as well. |