Merge #7706

7706: Revert "Replace usage of ast::NameOrNameRef with ast::NameLike" r=Veykril a=Veykril

This reverts commit e1dbf43cf85f84c3a7e40f9731fc1f7ac96f8979.

Co-authored-by: Lukas Wirth <[email protected]>

1 files changed, 3 insertions, 10 deletions

diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs
index 74cf64aab..c7609e90d 100644
--- a/crates/hir_expand/src/name.rs
+++ b/crates/hir_expand/src/name.rs
@@ -87,18 +87,11 @@ impl AsName for ast::Name {
     }
 }
 
-impl AsName for ast::Lifetime {
-    fn as_name(&self) -> Name {
-        Name::resolve(self.text())
-    }
-}
-
-impl AsName for ast::NameLike {
+impl AsName for ast::NameOrNameRef {
     fn as_name(&self) -> Name {
         match self {
-            ast::NameLike::Name(it) => it.as_name(),
-            ast::NameLike::NameRef(it) => it.as_name(),
-            ast::NameLike::Lifetime(it) => it.as_name(),
+            ast::NameOrNameRef::Name(it) => it.as_name(),
+            ast::NameOrNameRef::NameRef(it) => it.as_name(),
         }
     }
 }