Merge #1862

1862: Assoc item resolution refactoring (again) r=flodiebold a=flodiebold

This is #1849, with the associated type selection code removed for now. Handling cycles there will need some more thought.

Co-authored-by: Florian Diebold <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index e1c8d6ab0..e9fec54d8 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -52,14 +52,14 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
             if let Some(krate) = krate {
                 ty.iterate_impl_items(ctx.db, krate, |item| {
                     match item {
-                        hir::ImplItem::Method(func) => {
+                        hir::AssocItem::Function(func) => {
                             let data = func.data(ctx.db);
                             if !data.has_self_param() {
                                 acc.add_function(ctx, func);
                             }
                         }
-                        hir::ImplItem::Const(ct) => acc.add_const(ctx, ct),
-                        hir::ImplItem::TypeAlias(ty) => acc.add_type_alias(ctx, ty),
+                        hir::AssocItem::Const(ct) => acc.add_const(ctx, ct),
+                        hir::AssocItem::TypeAlias(ty) => acc.add_type_alias(ctx, ty),
                     }
                     None::<()>
                 });