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/syntax_highlighting.rs b/crates/ra_ide_api/src/syntax_highlighting.rs
index 86ab3a260..3d7f91c1d 100644
--- a/crates/ra_ide_api/src/syntax_highlighting.rs
+++ b/crates/ra_ide_api/src/syntax_highlighting.rs
@@ -102,9 +102,9 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
                         Some(Method(_)) => "function",
                         Some(Macro(_)) => "macro",
                         Some(FieldAccess(_)) => "field",
-                        Some(AssocItem(hir::ImplItem::Method(_))) => "function",
-                        Some(AssocItem(hir::ImplItem::Const(_))) => "constant",
-                        Some(AssocItem(hir::ImplItem::TypeAlias(_))) => "type",
+                        Some(AssocItem(hir::AssocItem::Function(_))) => "function",
+                        Some(AssocItem(hir::AssocItem::Const(_))) => "constant",
+                        Some(AssocItem(hir::AssocItem::TypeAlias(_))) => "type",
                         Some(Def(hir::ModuleDef::Module(_))) => "module",
                         Some(Def(hir::ModuleDef::Function(_))) => "function",
                         Some(Def(hir::ModuleDef::Adt(_))) => "type",