diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-19 12:15:55 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-19 12:15:55 +0100 |
commit | f209843e31af7f0e0212aa28ffec2efad2a70c6f (patch) | |
tree | 548227da78a3bea644f57714d075410c0bdf7469 /crates/ra_assists/src/fill_match_arms.rs | |
parent | 58d4983ba5745975446d60f2886d96f8d2adf0f2 (diff) | |
parent | d4a66166c002f0a49e41d856a49cb5685ac93202 (diff) |
Merge #1545
1545: migrate ra_syntax to the new rowan API r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_assists/src/fill_match_arms.rs')
-rw-r--r-- | crates/ra_assists/src/fill_match_arms.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_assists/src/fill_match_arms.rs b/crates/ra_assists/src/fill_match_arms.rs index deef166b5..b96806ac6 100644 --- a/crates/ra_assists/src/fill_match_arms.rs +++ b/crates/ra_assists/src/fill_match_arms.rs | |||
@@ -27,7 +27,7 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As | |||
27 | let mut arm_iter = arm_list.arms(); | 27 | let mut arm_iter = arm_list.arms(); |
28 | let first = arm_iter.next(); | 28 | let first = arm_iter.next(); |
29 | 29 | ||
30 | match first { | 30 | match &first { |
31 | // If there arm list is empty or there is only one trivial arm, then proceed. | 31 | // If there arm list is empty or there is only one trivial arm, then proceed. |
32 | Some(arm) if is_trivial_arm(arm) => { | 32 | Some(arm) if is_trivial_arm(arm) => { |
33 | if arm_iter.next() != None { | 33 | if arm_iter.next() != None { |
@@ -44,7 +44,7 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As | |||
44 | 44 | ||
45 | let expr = match_expr.expr()?; | 45 | let expr = match_expr.expr()?; |
46 | let analyzer = hir::SourceAnalyzer::new(ctx.db, ctx.frange.file_id, expr.syntax(), None); | 46 | let analyzer = hir::SourceAnalyzer::new(ctx.db, ctx.frange.file_id, expr.syntax(), None); |
47 | let match_expr_ty = analyzer.type_of(ctx.db, expr)?; | 47 | let match_expr_ty = analyzer.type_of(ctx.db, &expr)?; |
48 | let enum_def = analyzer.autoderef(ctx.db, match_expr_ty).find_map(|ty| match ty.as_adt() { | 48 | let enum_def = analyzer.autoderef(ctx.db, match_expr_ty).find_map(|ty| match ty.as_adt() { |
49 | Some((AdtDef::Enum(e), _)) => Some(e), | 49 | Some((AdtDef::Enum(e), _)) => Some(e), |
50 | _ => None, | 50 | _ => None, |