diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-29 23:48:04 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-29 23:48:04 +0100 |
commit | 9da454bcc2386e2782b71a9756b77a7763fd544b (patch) | |
tree | 72dc1cdc67d1cef8024b88cc05955ade68d917e2 /crates/ra_hir_expand/src/lib.rs | |
parent | 4567ae575e15cdb9af39b68b1490c062762ec39e (diff) | |
parent | ede5d17b0409f9d5a209aaf16508262dbd2a4489 (diff) |
Merge #5578
5578: Rename ModuleItem -> Item r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_expand/src/lib.rs')
-rw-r--r-- | crates/ra_hir_expand/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs index d9e31ac20..2e8d63691 100644 --- a/crates/ra_hir_expand/src/lib.rs +++ b/crates/ra_hir_expand/src/lib.rs | |||
@@ -159,7 +159,7 @@ impl HirFileId { | |||
159 | } | 159 | } |
160 | 160 | ||
161 | /// Indicate it is macro file generated for builtin derive | 161 | /// Indicate it is macro file generated for builtin derive |
162 | pub fn is_builtin_derive(&self, db: &dyn db::AstDatabase) -> Option<InFile<ast::ModuleItem>> { | 162 | pub fn is_builtin_derive(&self, db: &dyn db::AstDatabase) -> Option<InFile<ast::Item>> { |
163 | match self.0 { | 163 | match self.0 { |
164 | HirFileIdRepr::FileId(_) => None, | 164 | HirFileIdRepr::FileId(_) => None, |
165 | HirFileIdRepr::MacroFile(macro_file) => { | 165 | HirFileIdRepr::MacroFile(macro_file) => { |
@@ -174,7 +174,7 @@ impl HirFileId { | |||
174 | MacroDefKind::BuiltInDerive(_) => loc.kind.node(db), | 174 | MacroDefKind::BuiltInDerive(_) => loc.kind.node(db), |
175 | _ => return None, | 175 | _ => return None, |
176 | }; | 176 | }; |
177 | Some(item.with_value(ast::ModuleItem::cast(item.value.clone())?)) | 177 | Some(item.with_value(ast::Item::cast(item.value.clone())?)) |
178 | } | 178 | } |
179 | } | 179 | } |
180 | } | 180 | } |
@@ -258,7 +258,7 @@ pub struct MacroCallLoc { | |||
258 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 258 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
259 | pub enum MacroCallKind { | 259 | pub enum MacroCallKind { |
260 | FnLike(AstId<ast::MacroCall>), | 260 | FnLike(AstId<ast::MacroCall>), |
261 | Attr(AstId<ast::ModuleItem>, String), | 261 | Attr(AstId<ast::Item>, String), |
262 | } | 262 | } |
263 | 263 | ||
264 | impl MacroCallKind { | 264 | impl MacroCallKind { |