rust-analyzer

diff --git a/crates/hir-ty/src/method_resolution.rs b/crates/hir-ty/src/method_resolution.rs
index 8c7714b9a6..1a5ee97fd0 100644
--- a/crates/hir-ty/src/method_resolution.rs
+++ b/crates/hir-ty/src/method_resolution.rs

@@ -821,9 +821,9 @@ pub fn iterate_method_candidates_dyn(

let mut table = InferenceTable::new(db, env.clone());

let ty = table.instantiate_canonical(ty.clone());

- let (deref_chain, adj) = autoderef_method_receiver(&mut table, ty);

+ let deref_chain = autoderef_method_receiver(&mut table, ty);

- let result = deref_chain.into_iter().zip(adj).try_for_each(|(receiver_ty, adj)| {

+ let result = deref_chain.into_iter().try_for_each(|(receiver_ty, adj)| {

iterate_method_candidates_with_autoref(

&receiver_ty,

adj,

@@ -867,16 +867,20 @@ fn iterate_method_candidates_with_autoref(

return ControlFlow::Continue(());

}

- iterate_method_candidates_by_receiver(

- receiver_ty,

- first_adjustment.clone(),

- db,

- env.clone(),

- traits_in_scope,

- visible_from_module,

- name,

- &mut callback,

- )?;

+ let mut iterate_method_candidates_by_receiver = move |receiver_ty, first_adjustment| {

+ iterate_method_candidates_by_receiver(

+ receiver_ty,

+ first_adjustment,

+ db,

+ env.clone(),

+ traits_in_scope,

+ visible_from_module,

+ name,

+ &mut callback,

+ )

+ };

+ iterate_method_candidates_by_receiver(receiver_ty, first_adjustment.clone())?;

let refed = Canonical {

value: TyKind::Ref(Mutability::Not, static_lifetime(), receiver_ty.value.clone())

@@ -884,16 +888,7 @@ fn iterate_method_candidates_with_autoref(

binders: receiver_ty.binders.clone(),

};

- iterate_method_candidates_by_receiver(

- &refed,

- first_adjustment.with_autoref(Mutability::Not),

- db,

- env.clone(),

- traits_in_scope,

- visible_from_module,

- name,

- &mut callback,

- )?;

+ iterate_method_candidates_by_receiver(&refed, first_adjustment.with_autoref(Mutability::Not))?;

let ref_muted = Canonical {

value: TyKind::Ref(Mutability::Mut, static_lifetime(), receiver_ty.value.clone())

@@ -904,12 +899,6 @@ fn iterate_method_candidates_with_autoref(

iterate_method_candidates_by_receiver(

&ref_muted,

first_adjustment.with_autoref(Mutability::Mut),

- db,

- env,

- traits_in_scope,

- visible_from_module,

- name,

- &mut callback,

)

}

@@ -1210,8 +1199,8 @@ pub fn resolve_indexing_op(

) -> Option<ReceiverAdjustments> {

let mut table = InferenceTable::new(db, env.clone());

let ty = table.instantiate_canonical(ty);

- let (deref_chain, adj) = autoderef_method_receiver(&mut table, ty);

- for (ty, adj) in deref_chain.into_iter().zip(adj) {

+ let deref_chain = autoderef_method_receiver(&mut table, ty);

+ for (ty, adj) in deref_chain {

let goal = generic_implements_goal(db, env.clone(), index_trait, &ty);

if db.trait_solve(env.krate, goal.cast(Interner)).is_some() {

return Some(adj);

@@ -1421,25 +1410,24 @@ fn generic_implements_goal(

fn autoderef_method_receiver(

table: &mut InferenceTable<'_>,

ty: Ty,

-) -> (Vec<Canonical<Ty>>, Vec<ReceiverAdjustments>) {

- let (mut deref_chain, mut adjustments): (Vec<_>, Vec<_>) = (Vec::new(), Vec::new());

+) -> Vec<(Canonical<Ty>, ReceiverAdjustments)> {

+ let mut deref_chain: Vec<_> = Vec::new();

let mut autoderef = autoderef::Autoderef::new(table, ty);

while let Some((ty, derefs)) = autoderef.next() {

- deref_chain.push(autoderef.table.canonicalize(ty).value);

- adjustments.push(ReceiverAdjustments {

- autoref: None,

- autoderefs: derefs,

- unsize_array: false,

- });

+ deref_chain.push((

+ autoderef.table.canonicalize(ty).value,

+ ReceiverAdjustments { autoref: None, autoderefs: derefs, unsize_array: false },

+ ));

}

// As a last step, we can do array unsizing (that's the only unsizing that rustc does for method receivers!)

- if let (Some((TyKind::Array(parameters, _), binders)), Some(adj)) = (

- deref_chain.last().map(|ty| (ty.value.kind(Interner), ty.binders.clone())),

- adjustments.last().cloned(),

- ) {

+ if let Some((TyKind::Array(parameters, _), binders, adj)) =

+ deref_chain.last().map(|(ty, adj)| (ty.value.kind(Interner), ty.binders.clone(), adj))

+ {

let unsized_ty = TyKind::Slice(parameters.clone()).intern(Interner);

- deref_chain.push(Canonical { value: unsized_ty, binders });

- adjustments.push(ReceiverAdjustments { unsize_array: true, ..adj });

+ deref_chain.push((

+ Canonical { value: unsized_ty, binders },

+ ReceiverAdjustments { unsize_array: true, ..adj.clone() },

+ ));

}

- (deref_chain, adjustments)

+ deref_chain

}

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 163a319443..6206a541c1 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs

@@ -3339,12 +3339,10 @@ impl Type {

.map(move |ty| self.derived(ty))

}

- pub fn iterate_method_candidates<T>(

+ pub fn iterate_method_candidates_with_traits<T>(

&self,

db: &dyn HirDatabase,

scope: &SemanticsScope<'_>,

- // FIXME this can be retrieved from `scope`, except autoimport uses this

- // to specify a different set, so the method needs to be split

traits_in_scope: &FxHashSet<TraitId>,

with_local_impls: Option<Module>,

name: Option<&Name>,

@@ -3372,6 +3370,24 @@ impl Type {

slot

}

+ pub fn iterate_method_candidates<T>(

+ &self,

+ db: &dyn HirDatabase,

+ scope: &SemanticsScope<'_>,

+ with_local_impls: Option<Module>,

+ name: Option<&Name>,

+ callback: impl FnMut(Function) -> Option<T>,

+ ) -> Option<T> {

+ self.iterate_method_candidates_with_traits(

+ db,

+ scope,

+ &scope.visible_traits().0,

+ with_local_impls,

+ name,

+ callback,

+ )

+ }

fn iterate_method_candidates_dyn(

&self,

db: &dyn HirDatabase,

diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index 486b7ee62e..b3ba1c7d34 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs

@@ -1673,6 +1673,7 @@ impl<'a> SemanticsScope<'a> {

}

+#[derive(Debug)]

pub struct VisibleTraits(pub FxHashSet<TraitId>);

impl ops::Deref for VisibleTraits {

diff --git a/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs b/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs
index f32ef2d59d..9e1d9a702a 100644
--- a/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs
+++ b/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs

@@ -157,19 +157,12 @@ fn is_ref_and_impls_iter_method(

let iter_trait = FamousDefs(sema, krate).core_iter_Iterator()?;

let has_wanted_method = ty

- .iterate_method_candidates(

- sema.db,

- &scope,

- &scope.visible_traits().0,

- None,

- Some(&wanted_method),

- |func| {

- if func.ret_type(sema.db).impls_trait(sema.db, iter_trait, &[]) {

- return Some(());

- }

- None

- },

- )

+ .iterate_method_candidates(sema.db, &scope, None, Some(&wanted_method), |func| {

+ if func.ret_type(sema.db).impls_trait(sema.db, iter_trait, &[]) {

+ return Some(());

+ }

+ None

+ })

.is_some();

if !has_wanted_method {

return None;

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 9ce525ca37..4429186196 100644
--- a/crates/ide-assists/src/handlers/generate_is_empty_from_len.rs
+++ b/crates/ide-assists/src/handlers/generate_is_empty_from_len.rs

@@ -95,14 +95,7 @@ fn get_impl_method(

let scope = ctx.sema.scope(impl_.syntax())?;

let ty = impl_def.self_ty(db);

- ty.iterate_method_candidates(

- db,

- &scope,

- &scope.visible_traits().0,

- None,

- Some(fn_name),

- |func| Some(func),

- )

+ ty.iterate_method_candidates(db, &scope, None, Some(fn_name), |func| Some(func))

}

#[cfg(test)]

diff --git a/crates/ide-completion/src/completions/dot.rs b/crates/ide-completion/src/completions/dot.rs
index 7c6e5e100f..09ac57153a 100644
--- a/crates/ide-completion/src/completions/dot.rs
+++ b/crates/ide-completion/src/completions/dot.rs

@@ -122,7 +122,7 @@ fn complete_methods(

mut f: impl FnMut(hir::Function),

) {

let mut seen_methods = FxHashSet::default();

- receiver.iterate_method_candidates(

+ receiver.iterate_method_candidates_with_traits(

ctx.db,

&ctx.scope,

&ctx.traits_in_scope(),

diff --git a/crates/ide-db/src/imports/import_assets.rs b/crates/ide-db/src/imports/import_assets.rs
index 994d48385a..b26b0a9087 100644
--- a/crates/ide-db/src/imports/import_assets.rs
+++ b/crates/ide-db/src/imports/import_assets.rs

@@ -528,7 +528,7 @@ fn trait_applicable_items(

)

} else {

- trait_candidate.receiver_ty.iterate_method_candidates(

+ trait_candidate.receiver_ty.iterate_method_candidates_with_traits(

db,

scope,

&trait_candidates,