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 8bd0362dc..2764d8674 100644 --- a/crates/ra_hir_def/src/item_tree/lower.rs +++ b/crates/ra_hir_def/src/item_tree/lower.rs | |||
@@ -78,7 +78,7 @@ impl Ctx { | |||
78 | ast::Item::StructDef(_) | 78 | ast::Item::StructDef(_) |
79 | | ast::Item::UnionDef(_) | 79 | | ast::Item::UnionDef(_) |
80 | | ast::Item::EnumDef(_) | 80 | | ast::Item::EnumDef(_) |
81 | | ast::Item::FnDef(_) | 81 | | ast::Item::Fn(_) |
82 | | ast::Item::TypeAliasDef(_) | 82 | | ast::Item::TypeAliasDef(_) |
83 | | ast::Item::ConstDef(_) | 83 | | ast::Item::ConstDef(_) |
84 | | ast::Item::StaticDef(_) | 84 | | ast::Item::StaticDef(_) |
@@ -103,7 +103,7 @@ impl Ctx { | |||
103 | ast::Item::StructDef(ast) => self.lower_struct(ast).map(Into::into), | 103 | ast::Item::StructDef(ast) => self.lower_struct(ast).map(Into::into), |
104 | ast::Item::UnionDef(ast) => self.lower_union(ast).map(Into::into), | 104 | ast::Item::UnionDef(ast) => self.lower_union(ast).map(Into::into), |
105 | ast::Item::EnumDef(ast) => self.lower_enum(ast).map(Into::into), | 105 | ast::Item::EnumDef(ast) => self.lower_enum(ast).map(Into::into), |
106 | ast::Item::FnDef(ast) => self.lower_function(ast).map(Into::into), | 106 | ast::Item::Fn(ast) => self.lower_function(ast).map(Into::into), |
107 | ast::Item::TypeAliasDef(ast) => self.lower_type_alias(ast).map(Into::into), | 107 | ast::Item::TypeAliasDef(ast) => self.lower_type_alias(ast).map(Into::into), |
108 | ast::Item::StaticDef(ast) => self.lower_static(ast).map(Into::into), | 108 | ast::Item::StaticDef(ast) => self.lower_static(ast).map(Into::into), |
109 | ast::Item::ConstDef(ast) => Some(self.lower_const(ast).into()), | 109 | ast::Item::ConstDef(ast) => Some(self.lower_const(ast).into()), |
@@ -155,7 +155,7 @@ impl Ctx { | |||
155 | 155 | ||
156 | fn lower_assoc_item(&mut self, item: &ast::AssocItem) -> Option<AssocItem> { | 156 | fn lower_assoc_item(&mut self, item: &ast::AssocItem) -> Option<AssocItem> { |
157 | match item { | 157 | match item { |
158 | ast::AssocItem::FnDef(ast) => self.lower_function(ast).map(Into::into), | 158 | ast::AssocItem::Fn(ast) => self.lower_function(ast).map(Into::into), |
159 | ast::AssocItem::TypeAliasDef(ast) => self.lower_type_alias(ast).map(Into::into), | 159 | ast::AssocItem::TypeAliasDef(ast) => self.lower_type_alias(ast).map(Into::into), |
160 | ast::AssocItem::ConstDef(ast) => Some(self.lower_const(ast).into()), | 160 | ast::AssocItem::ConstDef(ast) => Some(self.lower_const(ast).into()), |
161 | ast::AssocItem::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into), | 161 | ast::AssocItem::MacroCall(ast) => self.lower_macro_call(ast).map(Into::into), |
@@ -277,7 +277,7 @@ impl Ctx { | |||
277 | Some(res) | 277 | Some(res) |
278 | } | 278 | } |
279 | 279 | ||
280 | fn lower_function(&mut self, func: &ast::FnDef) -> Option<FileItemTreeId<Function>> { | 280 | fn lower_function(&mut self, func: &ast::Fn) -> Option<FileItemTreeId<Function>> { |
281 | let visibility = self.lower_visibility(func); | 281 | let visibility = self.lower_visibility(func); |
282 | let name = func.name()?.as_name(); | 282 | let name = func.name()?.as_name(); |
283 | 283 | ||
@@ -547,7 +547,7 @@ impl Ctx { | |||
547 | self.collect_inner_items(item.syntax()); | 547 | self.collect_inner_items(item.syntax()); |
548 | let attrs = Attrs::new(&item, &self.hygiene); | 548 | let attrs = Attrs::new(&item, &self.hygiene); |
549 | let id: ModItem = match item { | 549 | let id: ModItem = match item { |
550 | ast::ExternItem::FnDef(ast) => { | 550 | ast::ExternItem::Fn(ast) => { |
551 | let func = self.lower_function(&ast)?; | 551 | let func = self.lower_function(&ast)?; |
552 | self.data().functions[func.index].is_unsafe = true; | 552 | self.data().functions[func.index].is_unsafe = true; |
553 | func.into() | 553 | func.into() |