Merge #11393

[rust.git] / crates / ide_assists / src / handlers / generate_is_empty_from_len.rs

diff --git a/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs b/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs
index b8834d283d7e321efd74eccf56eb8ca5247adfa3..cb3fbed21995a74682d8c3a55fa8a096e7564a8a 100644 (file)
--- a/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs
+++ b/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs
@@ -1,6 +1,6 @@
 use hir::{known, HasSource, Name};
 use syntax::{
-    ast::{self, NameOwner},
+    ast::{self, HasName},
     AstNode,
 };
 
@@ -91,9 +91,11 @@ fn get_impl_method(
 
     let scope = ctx.sema.scope(impl_.syntax());
     let krate = impl_def.module(db).krate();
-    let ty = impl_def.target_ty(db);
-    let traits_in_scope = scope.traits_in_scope();
-    ty.iterate_method_candidates(db, krate, &traits_in_scope, Some(fn_name), |_, func| Some(func))
+    let ty = impl_def.self_ty(db);
+    let traits_in_scope = scope.visible_traits();
+    ty.iterate_method_candidates(db, krate, &traits_in_scope, None, Some(fn_name), |_, func| {
+        Some(func)
+    })
 }
 
 #[cfg(test)]