Merge #988

988: Consolidate Ty variants into a new variant Ty::Apply r=matklad a=flodiebold

This gets us a lot closer to Chalk. It also introduces a lot of boilerplate, though, especially when matching :/ A lot of this can probably be refactored to be nicer, though.

Co-authored-by: Florian Diebold <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_struct_literal.rs b/crates/ra_ide_api/src/completion/complete_struct_literal.rs
index 6bef9624e..b75526282 100644
--- a/crates/ra_ide_api/src/completion/complete_struct_literal.rs
+++ b/crates/ra_ide_api/src/completion/complete_struct_literal.rs
@@ -1,4 +1,4 @@
-use hir::{Ty, AdtDef};
+use hir::AdtDef;
 
 use crate::completion::{CompletionContext, Completions};
 
@@ -15,8 +15,8 @@ pub(super) fn complete_struct_literal(acc: &mut Completions, ctx: &CompletionCon
         None => return,
     };
     let ty = infer_result[expr].clone();
-    let (adt, substs) = match ty {
-        Ty::Adt { def_id, ref substs, .. } => (def_id, substs),
+    let (adt, substs) = match ty.as_adt() {
+        Some(res) => res,
         _ => return,
     };
     match adt {