diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index a2840c15d6f..a8e115e47eb 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs @@ -51,12 +51,12 @@ pub struct Body { pub struct BodySourceMap { expr_map: FxHashMap, expr_map_back: ArenaMap, - pat_map: FxHashMap, - pat_map_back: ArenaMap, + pat_map: FxHashMap, + pat_map_back: ArenaMap, field_map: FxHashMap<(ExprId, usize), AstPtr>, } -type PatPrr = Either, AstPtr>; +type PatPtr = Either, AstPtr>; impl Body { pub fn params(&self) -> &[PatId] { @@ -129,11 +129,11 @@ impl BodySourceMap { self.expr_map.get(&SyntaxNodePtr::new(node.syntax())).cloned() } - pub fn pat_syntax(&self, pat: PatId) -> Option { + pub fn pat_syntax(&self, pat: PatId) -> Option { self.pat_map_back.get(pat).cloned() } - pub fn syntax_pat(&self, ptr: PatPrr) -> Option { + pub fn syntax_pat(&self, ptr: PatPtr) -> Option { self.pat_map.get(&ptr).cloned() } @@ -506,7 +506,7 @@ impl ExprCollector { id } - fn alloc_pat(&mut self, pat: Pat, ptr: PatPrr) -> PatId { + fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId { let id = self.pats.alloc(pat); self.source_map.pat_map.insert(ptr, id); self.source_map.pat_map_back.insert(id, ptr);