diff options
Diffstat (limited to 'crates/ra_hir_def/src/item_tree/lower.rs')
-rw-r--r-- | crates/ra_hir_def/src/item_tree/lower.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs index f10ad25f7..e2e00323c 100644 --- a/crates/ra_hir_def/src/item_tree/lower.rs +++ b/crates/ra_hir_def/src/item_tree/lower.rs | |||
@@ -196,7 +196,7 @@ impl Ctx { | |||
196 | } | 196 | } |
197 | } | 197 | } |
198 | 198 | ||
199 | fn lower_record_fields(&mut self, fields: &ast::RecordFieldDefList) -> Range<Idx<Field>> { | 199 | fn lower_record_fields(&mut self, fields: &ast::RecordFieldDefList) -> FieldIds { |
200 | let start = self.next_field_idx(); | 200 | let start = self.next_field_idx(); |
201 | for field in fields.fields() { | 201 | for field in fields.fields() { |
202 | if let Some(data) = self.lower_record_field(&field) { | 202 | if let Some(data) = self.lower_record_field(&field) { |
@@ -204,7 +204,7 @@ impl Ctx { | |||
204 | } | 204 | } |
205 | } | 205 | } |
206 | let end = self.next_field_idx(); | 206 | let end = self.next_field_idx(); |
207 | start..end | 207 | FieldIds::new(start..end) |
208 | } | 208 | } |
209 | 209 | ||
210 | fn lower_record_field(&mut self, field: &ast::RecordFieldDef) -> Option<Field> { | 210 | fn lower_record_field(&mut self, field: &ast::RecordFieldDef) -> Option<Field> { |
@@ -215,7 +215,7 @@ impl Ctx { | |||
215 | Some(res) | 215 | Some(res) |
216 | } | 216 | } |
217 | 217 | ||
218 | fn lower_tuple_fields(&mut self, fields: &ast::TupleFieldDefList) -> Range<Idx<Field>> { | 218 | fn lower_tuple_fields(&mut self, fields: &ast::TupleFieldDefList) -> FieldIds { |
219 | let start = self.next_field_idx(); | 219 | let start = self.next_field_idx(); |
220 | for (i, field) in fields.fields().enumerate() { | 220 | for (i, field) in fields.fields().enumerate() { |
221 | if let Some(data) = self.lower_tuple_field(i, &field) { | 221 | if let Some(data) = self.lower_tuple_field(i, &field) { |
@@ -223,7 +223,7 @@ impl Ctx { | |||
223 | } | 223 | } |
224 | } | 224 | } |
225 | let end = self.next_field_idx(); | 225 | let end = self.next_field_idx(); |
226 | start..end | 226 | FieldIds::new(start..end) |
227 | } | 227 | } |
228 | 228 | ||
229 | fn lower_tuple_field(&mut self, idx: usize, field: &ast::TupleFieldDef) -> Option<Field> { | 229 | fn lower_tuple_field(&mut self, idx: usize, field: &ast::TupleFieldDef) -> Option<Field> { |
@@ -242,7 +242,7 @@ impl Ctx { | |||
242 | Some(record_field_def_list) => { | 242 | Some(record_field_def_list) => { |
243 | self.lower_fields(&StructKind::Record(record_field_def_list)) | 243 | self.lower_fields(&StructKind::Record(record_field_def_list)) |
244 | } | 244 | } |
245 | None => Fields::Record(self.next_field_idx()..self.next_field_idx()), | 245 | None => Fields::Record(FieldIds::new(self.next_field_idx()..self.next_field_idx())), |
246 | }; | 246 | }; |
247 | let ast_id = self.source_ast_id_map.ast_id(union); | 247 | let ast_id = self.source_ast_id_map.ast_id(union); |
248 | let res = Union { name, visibility, generic_params, fields, ast_id }; | 248 | let res = Union { name, visibility, generic_params, fields, ast_id }; |