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

77
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,43 +48,46 @@ 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() { .fields(db)
let missed_fields: Vec<Name> = s .iter()
.fields(db) .filter_map(|f| {
.iter() let name = f.name(db);
.filter_map(|f| { if lit_fields.contains(&name) {
let name = f.name(db); None
if lit_fields.contains(&name) { } else {
None Some(name)
} else { }
Some(name) })
} .collect();
}) if missed_fields.is_empty() {
.collect(); return;
if missed_fields.is_empty() { }
return; let source_map = self.func.body_source_map(db);
} let file_id = self.func.source(db).0;
let source_map = self.func.body_source_map(db); let source_file = db.parse(file_id.original_file(db));
let file_id = self.func.source(db).0; if let Some(field_list_node) = source_map
let source_file = db.parse(file_id.original_file(db)); .expr_syntax(id)
if let Some(field_list_node) = source_map .map(|ptr| ptr.to_node(source_file.syntax()))
.expr_syntax(id) .and_then(StructLit::cast)
.map(|ptr| ptr.to_node(source_file.syntax())) .and_then(|lit| lit.named_field_list())
.and_then(StructLit::cast) {
.and_then(|lit| lit.named_field_list()) let field_list_ptr = AstPtr::new(field_list_node);
{ self.sink.push(MissingFields {
let field_list_ptr = AstPtr::new(field_list_node); file: file_id,
self.sink.push(MissingFields { field_list: field_list_ptr,
file: file_id, missed_fields,
field_list: field_list_ptr, })
missed_fields,
})
}
} }
} }
} }