diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-29 20:40:29 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-29 20:40:29 +0000 |
commit | 5e78036e6c8752fda350818afdd411ab25f405ce (patch) | |
tree | e099bb9e9c04392dcb7fed54200a989f663f3659 /crates/ra_hir_def/src/nameres | |
parent | e91320632a9dfee937c3c2ba3ffafd3f5ffb22dc (diff) | |
parent | a1e18695548b5cd6661f26a985b34c8b105e1896 (diff) |
Merge #3379
3379: Rename ast::ImplBlock -> ast::ImplDef r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/nameres')
-rw-r--r-- | crates/ra_hir_def/src/nameres/raw.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs index 0e8c9da76..ea3c00da8 100644 --- a/crates/ra_hir_def/src/nameres/raw.rs +++ b/crates/ra_hir_def/src/nameres/raw.rs | |||
@@ -213,7 +213,7 @@ impl_arena_id!(Impl); | |||
213 | 213 | ||
214 | #[derive(Debug, PartialEq, Eq)] | 214 | #[derive(Debug, PartialEq, Eq)] |
215 | pub(super) struct ImplData { | 215 | pub(super) struct ImplData { |
216 | pub(super) ast_id: FileAstId<ast::ImplBlock>, | 216 | pub(super) ast_id: FileAstId<ast::ImplDef>, |
217 | } | 217 | } |
218 | 218 | ||
219 | struct RawItemsCollector { | 219 | struct RawItemsCollector { |
@@ -249,7 +249,7 @@ impl RawItemsCollector { | |||
249 | self.add_extern_crate_item(current_module, extern_crate); | 249 | self.add_extern_crate_item(current_module, extern_crate); |
250 | return; | 250 | return; |
251 | } | 251 | } |
252 | ast::ModuleItem::ImplBlock(it) => { | 252 | ast::ModuleItem::ImplDef(it) => { |
253 | self.add_impl(current_module, it); | 253 | self.add_impl(current_module, it); |
254 | return; | 254 | return; |
255 | } | 255 | } |
@@ -395,7 +395,7 @@ impl RawItemsCollector { | |||
395 | self.push_item(current_module, attrs, RawItemKind::Macro(m)); | 395 | self.push_item(current_module, attrs, RawItemKind::Macro(m)); |
396 | } | 396 | } |
397 | 397 | ||
398 | fn add_impl(&mut self, current_module: Option<Module>, imp: ast::ImplBlock) { | 398 | fn add_impl(&mut self, current_module: Option<Module>, imp: ast::ImplDef) { |
399 | let attrs = self.parse_attrs(&imp); | 399 | let attrs = self.parse_attrs(&imp); |
400 | let ast_id = self.source_ast_id_map.ast_id(&imp); | 400 | let ast_id = self.source_ast_id_map.ast_id(&imp); |
401 | let imp = self.raw_items.impls.alloc(ImplData { ast_id }); | 401 | let imp = self.raw_items.impls.alloc(ImplData { ast_id }); |