diff options
| author | Seivan Heidari <[email protected]> | 2019-11-28 07:19:14 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-28 07:19:14 +0000 |
| commit | 18a0937585b836ec5ed054b9ae48e0156ab6d9ef (patch) | |
| tree | 9de2c0267ddcc00df717f90034d0843d751a851b /crates/ra_assists/src/assists/fill_match_arms.rs | |
| parent | a7394b44c870f585eacfeb3036a33471aff49ff8 (diff) | |
| parent | 484acc8a61d599662ed63a4cbda091d38a982551 (diff) | |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates/ra_assists/src/assists/fill_match_arms.rs')
| -rw-r--r-- | crates/ra_assists/src/assists/fill_match_arms.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_assists/src/assists/fill_match_arms.rs b/crates/ra_assists/src/assists/fill_match_arms.rs index 8482897c5..b75bd44eb 100644 --- a/crates/ra_assists/src/assists/fill_match_arms.rs +++ b/crates/ra_assists/src/assists/fill_match_arms.rs | |||
| @@ -83,10 +83,11 @@ fn resolve_enum_def( | |||
| 83 | ) -> Option<ast::EnumDef> { | 83 | ) -> Option<ast::EnumDef> { |
| 84 | let expr_ty = analyzer.type_of(db, &expr)?; | 84 | let expr_ty = analyzer.type_of(db, &expr)?; |
| 85 | 85 | ||
| 86 | analyzer.autoderef(db, expr_ty).find_map(|ty| match ty.as_adt() { | 86 | let res = expr_ty.autoderef(db).find_map(|ty| match ty.as_adt() { |
| 87 | Some((Adt::Enum(e), _)) => Some(e.source(db).value), | 87 | Some(Adt::Enum(e)) => Some(e.source(db).value), |
| 88 | _ => None, | 88 | _ => None, |
| 89 | }) | 89 | }); |
| 90 | res | ||
| 90 | } | 91 | } |
| 91 | 92 | ||
| 92 | fn build_pat(var: ast::EnumVariant) -> Option<ast::Pat> { | 93 | fn build_pat(var: ast::EnumVariant) -> Option<ast::Pat> { |