Merge #1289

1289: simplify r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

crates/ra_hir/src/expr/validation.rs

@@ -5,13 +5,11 @@ use ra_syntax::ast::{AstNode, StructLit};
 
 use crate::{
     expr::AstPtr,
-    HirDatabase,
-    Function,
-    Name,
+    HirDatabase, Function, Name,
     diagnostics::{DiagnosticSink, MissingFields},
     adt::AdtDef,
     Path,
-    ty::InferenceResult
+    ty::InferenceResult,
 };
 use super::{Expr, StructLitField, ExprId};
 
@@ -50,13 +48,17 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
         spread: &Option<ExprId>,
         db: &impl HirDatabase,
     ) {
-        if let Some(_) = spread {
+        if spread.is_some() {
             return;
         }
+
+        let struct_def = match self.infer[id].as_adt() {
+            Some((AdtDef::Struct(s), _)) => s,
+            _ => return,
+        };
+
         let lit_fields: FxHashSet<_> = fields.into_iter().map(|f| &f.name).collect();
-        let struct_ty = &self.infer[id];
-        if let Some((AdtDef::Struct(s), _)) = struct_ty.as_adt() {
-            let missed_fields: Vec<Name> = s
+        let missed_fields: Vec<Name> = struct_def
             .fields(db)
             .iter()
             .filter_map(|f| {
@@ -88,5 +90,4 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
             })
         }
     }
-    }
 }