mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #1289

Browse Source 
1289: simplify r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-05-20 20:02:18 +00:00
commit 9383ae720b
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ra_hir/src/expr/validation.rs
View File

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