From 9faf8dd69a819e50b9c973857fe324d7605e2d24 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 8 Mar 2021 22:14:52 +0300
Subject: Hygiene is an internal implementation detail of the compiler

---
 crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs | 4 ++--
 crates/ide_assists/src/handlers/qualify_path.rs                     | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'crates/ide_assists')

diff --git a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
index 4f0422e96..335e0ed95 100644
--- a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -1,7 +1,7 @@
 use std::iter;
 
 use either::Either;
-use hir::{AsName, Module, ModuleDef, Name, Variant};
+use hir::{Module, ModuleDef, Name, Variant};
 use ide_db::{
     defs::Definition,
     helpers::{
@@ -133,7 +133,7 @@ fn existing_definition(db: &RootDatabase, variant_name: &ast::Name, variant: &Va
             ),
             _ => false,
         })
-        .any(|(name, _)| name == variant_name.as_name())
+        .any(|(name, _)| name.to_string() == variant_name.to_string())
 }
 
 fn insert_import(
diff --git a/crates/ide_assists/src/handlers/qualify_path.rs b/crates/ide_assists/src/handlers/qualify_path.rs
index b0b0d31b4..d84ca0e55 100644
--- a/crates/ide_assists/src/handlers/qualify_path.rs
+++ b/crates/ide_assists/src/handlers/qualify_path.rs
@@ -1,6 +1,6 @@
 use std::iter;
 
-use hir::{AsAssocItem, AsName};
+use hir::AsAssocItem;
 use ide_db::helpers::{import_assets::ImportCandidate, mod_path_to_ast};
 use ide_db::RootDatabase;
 use syntax::{
@@ -160,7 +160,9 @@ fn find_trait_method(
 ) -> Option<hir::Function> {
     if let Some(hir::AssocItem::Function(method)) =
         trait_.items(db).into_iter().find(|item: &hir::AssocItem| {
-            item.name(db).map(|name| name == trait_method_name.as_name()).unwrap_or(false)
+            item.name(db)
+                .map(|name| name.to_string() == trait_method_name.to_string())
+                .unwrap_or(false)
         })
     {
         Some(method)
-- 
cgit v1.2.3