diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 16:51:06 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 16:51:06 +0100 |
commit | 97df465391f50521c5102474d7e0ee2ea61ef48e (patch) | |
tree | 2bda021d9fafc6af927ebfbcafd31537496bd53c /crates/ra_hir_def/src/item_tree/lower.rs | |
parent | 0c8944314cb323416c8ad6ad27347ca056c5a91c (diff) | |
parent | 216a5344c8ef3c3e430d2761dc8b1a7b60250a15 (diff) |
Merge #5602
5602: Rename StructDef -> Struct r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/item_tree/lower.rs')
-rw-r--r-- | crates/ra_hir_def/src/item_tree/lower.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs index 2721a02a5..a85618015 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 | 78 | ||
79 | // Collect inner items for 1-to-1-lowered items. | 79 | // Collect inner items for 1-to-1-lowered items. |
80 | match item { | 80 | match item { |
81 | ast::Item::StructDef(_) | 81 | ast::Item::Struct(_) |
82 | | ast::Item::Union(_) | 82 | | ast::Item::Union(_) |
83 | | ast::Item::EnumDef(_) | 83 | | ast::Item::EnumDef(_) |
84 | | ast::Item::Fn(_) | 84 | | ast::Item::Fn(_) |
@@ -103,7 +103,7 @@ impl Ctx { | |||
103 | 103 | ||
104 | let attrs = Attrs::new(item, &self.hygiene); | 104 | let attrs = Attrs::new(item, &self.hygiene); |
105 | let items = match item { | 105 | let items = match item { |
106 | ast::Item::StructDef(ast) => self.lower_struct(ast).map(Into::into), | 106 | ast::Item::Struct(ast) => self.lower_struct(ast).map(Into::into), |
107 | ast::Item::Union(ast) => self.lower_union(ast).map(Into::into), | 107 | ast::Item::Union(ast) => self.lower_union(ast).map(Into::into), |
108 | ast::Item::EnumDef(ast) => self.lower_enum(ast).map(Into::into), | 108 | ast::Item::EnumDef(ast) => self.lower_enum(ast).map(Into::into), |
109 | ast::Item::Fn(ast) => self.lower_function(ast).map(Into::into), | 109 | ast::Item::Fn(ast) => self.lower_function(ast).map(Into::into), |
@@ -165,7 +165,7 @@ impl Ctx { | |||
165 | } | 165 | } |
166 | } | 166 | } |
167 | 167 | ||
168 | fn lower_struct(&mut self, strukt: &ast::StructDef) -> Option<FileItemTreeId<Struct>> { | 168 | fn lower_struct(&mut self, strukt: &ast::Struct) -> Option<FileItemTreeId<Struct>> { |
169 | let visibility = self.lower_visibility(strukt); | 169 | let visibility = self.lower_visibility(strukt); |
170 | let name = strukt.name()?.as_name(); | 170 | let name = strukt.name()?.as_name(); |
171 | let generic_params = self.lower_generic_params(GenericsOwner::Struct, strukt); | 171 | let generic_params = self.lower_generic_params(GenericsOwner::Struct, strukt); |