language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Move parsing of field pattern lists to the parser (where it belongs)

Browse source
This commit is contained in:
Marcus Klaas de Vries 2019-01-18 14:52:31 +01:00 • committed by Aleksey Kladov
parent d2769837f1
commit f9a6050034
6 changed files with 71 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_hir/src/expr.rs
View file

@ -857,11 +857,19 @@ impl ExprCollector {
let fields = p
.field_pat_list()
.expect("every struct should have a field list")
.field_pats()
.into_iter()
.pats()
.map(|f| {
let name = Name::new(f.ident);
let pat = self.collect_pat(&*f.pat);
let ast_pat = f.pat().expect("field pat always contains a pattern");
let pat = self.collect_pat(ast_pat);
let name = f
.name()
.unwrap_or_else(|| {
ast::BindPat::cast(ast_pat.syntax())
.expect("field pat without label is a bind pat")
.name()
.expect("bind pat has a name")
})
.as_name();
FieldPat { name, pat }
})
.collect();