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::{
expr::AstPtr,
HirDatabase,
Function,
Name,
HirDatabase, Function, Name,
diagnostics::{DiagnosticSink, MissingFields},
adt::AdtDef,
Path,
ty::InferenceResult
ty::InferenceResult,
};
use super::{Expr, StructLitField, ExprId};
@ -50,43 +48,46 @@ 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
.fields(db)
.iter()
.filter_map(|f| {
let name = f.name(db);
if lit_fields.contains(&name) {
None
} else {
Some(name)
}
})
.collect();
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_file = db.parse(file_id.original_file(db));
if let Some(field_list_node) = source_map
.expr_syntax(id)
.map(|ptr| ptr.to_node(source_file.syntax()))
.and_then(StructLit::cast)
.and_then(|lit| lit.named_field_list())
{
let field_list_ptr = AstPtr::new(field_list_node);
self.sink.push(MissingFields {
file: file_id,
field_list: field_list_ptr,
missed_fields,
})
}
let missed_fields: Vec<Name> = struct_def
.fields(db)
.iter()
.filter_map(|f| {
let name = f.name(db);
if lit_fields.contains(&name) {
None
} else {
Some(name)
}
})
.collect();
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_file = db.parse(file_id.original_file(db));
if let Some(field_list_node) = source_map
.expr_syntax(id)
.map(|ptr| ptr.to_node(source_file.syntax()))
.and_then(StructLit::cast)
.and_then(|lit| lit.named_field_list())
{
let field_list_ptr = AstPtr::new(field_list_node);
self.sink.push(MissingFields {
file: file_id,
field_list: field_list_ptr,
missed_fields,
})
}
}
}