Merge #4321

4321: Rename ImplItem to AssocItem r=matklad a=edwin0cheng

Related discussion: https://github.com/rust-analyzer/rust-analyzer/pull/4283#discussion_r419352265

Co-authored-by: Edwin Cheng <[email protected]>

1 files changed, 9 insertions, 9 deletions

diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs
index 2dbae04d3..e7eb2bb11 100644
--- a/crates/ra_hir_def/src/data.rs
+++ b/crates/ra_hir_def/src/data.rs
@@ -9,7 +9,7 @@ use hir_expand::{
 };
 use ra_prof::profile;
 use ra_syntax::ast::{
-    self, AstNode, ImplItem, ModuleItemOwner, NameOwner, TypeAscriptionOwner, TypeBoundsOwner,
+    self, AssocItem, AstNode, ModuleItemOwner, NameOwner, TypeAscriptionOwner, TypeBoundsOwner,
     VisibilityOwner,
 };
 
@@ -164,7 +164,7 @@ impl TraitData {
             items.extend(collect_items(
                 db,
                 &mut expander,
-                item_list.impl_items(),
+                item_list.assoc_items(),
                 src.file_id,
                 container,
             ));
@@ -219,7 +219,7 @@ impl ImplData {
         if let Some(item_list) = src.value.item_list() {
             let mut expander = Expander::new(db, impl_loc.ast_id.file_id, module_id);
             items.extend(
-                collect_items(db, &mut expander, item_list.impl_items(), src.file_id, container)
+                collect_items(db, &mut expander, item_list.assoc_items(), src.file_id, container)
                     .into_iter()
                     .map(|(_, item)| item),
             );
@@ -304,7 +304,7 @@ fn collect_items_in_macro(
         let mut res = collect_items(
             db,
             expander,
-            items.value.items().filter_map(|it| ImplItem::cast(it.syntax().clone())),
+            items.value.items().filter_map(|it| AssocItem::cast(it.syntax().clone())),
             items.file_id,
             container,
         );
@@ -325,15 +325,15 @@ fn collect_items_in_macro(
 fn collect_items(
     db: &dyn DefDatabase,
     expander: &mut Expander,
-    impl_items: impl Iterator<Item = ImplItem>,
+    assoc_items: impl Iterator<Item = AssocItem>,
     file_id: crate::HirFileId,
     container: AssocContainerId,
 ) -> Vec<(Name, AssocItemId)> {
     let items = db.ast_id_map(file_id);
 
-    impl_items
+    assoc_items
         .filter_map(|item_node| match item_node {
-            ast::ImplItem::FnDef(it) => {
+            ast::AssocItem::FnDef(it) => {
                 let name = it.name().map_or_else(Name::missing, |it| it.as_name());
                 if !expander.is_cfg_enabled(&it) {
                     return None;
@@ -342,13 +342,13 @@ fn collect_items(
                     .intern(db);
                 Some((name, def.into()))
             }
-            ast::ImplItem::ConstDef(it) => {
+            ast::AssocItem::ConstDef(it) => {
                 let name = it.name().map_or_else(Name::missing, |it| it.as_name());
                 let def = ConstLoc { container, ast_id: AstId::new(file_id, items.ast_id(&it)) }
                     .intern(db);
                 Some((name, def.into()))
             }
-            ast::ImplItem::TypeAliasDef(it) => {
+            ast::AssocItem::TypeAliasDef(it) => {
                 let name = it.name().map_or_else(Name::missing, |it| it.as_name());
                 let def =
                     TypeAliasLoc { container, ast_id: AstId::new(file_id, items.ast_id(&it)) }