diff options
author | Aleksey Kladov <[email protected]> | 2019-11-14 06:43:59 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-14 06:57:57 +0000 |
commit | c89010df2d586eec33b50f3afcc4b2226da32672 (patch) | |
tree | aa2a59b52df1632c3dbedd41ac31f45400f60409 /crates/ra_hir_def/src/body/lower.rs | |
parent | e7e85c60d2c225eacc80184a7918ecf6c8ab0563 (diff) |
Add Expader::to_source
Diffstat (limited to 'crates/ra_hir_def/src/body/lower.rs')
-rw-r--r-- | crates/ra_hir_def/src/body/lower.rs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs index 602bcb220..1ea8ce249 100644 --- a/crates/ra_hir_def/src/body/lower.rs +++ b/crates/ra_hir_def/src/body/lower.rs | |||
@@ -4,7 +4,7 @@ use hir_expand::{ | |||
4 | either::Either, | 4 | either::Either, |
5 | hygiene::Hygiene, | 5 | hygiene::Hygiene, |
6 | name::{self, AsName, Name}, | 6 | name::{self, AsName, Name}, |
7 | AstId, MacroCallLoc, MacroFileKind, Source, | 7 | AstId, MacroCallLoc, MacroFileKind, |
8 | }; | 8 | }; |
9 | use ra_arena::Arena; | 9 | use ra_arena::Arena; |
10 | use ra_syntax::{ | 10 | use ra_syntax::{ |
@@ -99,9 +99,7 @@ where | |||
99 | if !self.expander.is_in_expansion() { | 99 | if !self.expander.is_in_expansion() { |
100 | self.source_map.expr_map.insert(ptr, id); | 100 | self.source_map.expr_map.insert(ptr, id); |
101 | } | 101 | } |
102 | self.source_map | 102 | self.source_map.expr_map_back.insert(id, self.expander.to_source(ptr)); |
103 | .expr_map_back | ||
104 | .insert(id, Source { file_id: self.expander.current_file_id, ast: ptr }); | ||
105 | id | 103 | id |
106 | } | 104 | } |
107 | // desugared exprs don't have ptr, that's wrong and should be fixed | 105 | // desugared exprs don't have ptr, that's wrong and should be fixed |
@@ -115,9 +113,7 @@ where | |||
115 | if !self.expander.is_in_expansion() { | 113 | if !self.expander.is_in_expansion() { |
116 | self.source_map.expr_map.insert(ptr, id); | 114 | self.source_map.expr_map.insert(ptr, id); |
117 | } | 115 | } |
118 | self.source_map | 116 | self.source_map.expr_map_back.insert(id, self.expander.to_source(ptr)); |
119 | .expr_map_back | ||
120 | .insert(id, Source { file_id: self.expander.current_file_id, ast: ptr }); | ||
121 | id | 117 | id |
122 | } | 118 | } |
123 | fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId { | 119 | fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId { |
@@ -125,9 +121,7 @@ where | |||
125 | if !self.expander.is_in_expansion() { | 121 | if !self.expander.is_in_expansion() { |
126 | self.source_map.pat_map.insert(ptr, id); | 122 | self.source_map.pat_map.insert(ptr, id); |
127 | } | 123 | } |
128 | self.source_map | 124 | self.source_map.pat_map_back.insert(id, self.expander.to_source(ptr)); |
129 | .pat_map_back | ||
130 | .insert(id, Source { file_id: self.expander.current_file_id, ast: ptr }); | ||
131 | id | 125 | id |
132 | } | 126 | } |
133 | 127 | ||