7 files changed, 66 insertions, 61 deletions

diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs
index 1cb712e32..aa5d60c7b 100644
--- a/crates/ra_ide/src/call_hierarchy.rs
+++ b/crates/ra_ide/src/call_hierarchy.rs
@@ -121,7 +121,7 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio
                     Some(macro_def.to_nav(db))
                 }
             } {
-                Some((func_target.clone(), name_ref.value.text_range()))
+                Some((func_target, name_ref.value.text_range()))
             } else {
                 None
             }
diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs
index a7023529b..72a68522e 100644
--- a/crates/ra_ide/src/call_info.rs
+++ b/crates/ra_ide/src/call_info.rs
@@ -1,10 +1,10 @@
 //! FIXME: write short doc here
-
 use hir::db::AstDatabase;
 use ra_syntax::{
     ast::{self, ArgListOwner},
     match_ast, AstNode, SyntaxNode,
 };
+
 use test_utils::tested_by;
 
 use crate::{
@@ -51,36 +51,39 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
     // If we have a calling expression let's find which argument we are on
     let num_params = call_info.parameters().len();
 
-    if num_params == 1 {
-        if !has_self {
-            call_info.active_parameter = Some(0);
-        }
-    } else if num_params > 1 {
-        // Count how many parameters into the call we are.
-        if let Some(arg_list) = calling_node.arg_list() {
-            // Number of arguments specified at the call site
-            let num_args_at_callsite = arg_list.args().count();
-
-            let arg_list_range = arg_list.syntax().text_range();
-            if !arg_list_range.contains_inclusive(position.offset) {
-                tested_by!(call_info_bad_offset);
-                return None;
+    match num_params {
+        0 => (),
+        1 => {
+            if !has_self {
+                call_info.active_parameter = Some(0);
             }
+        }
+        _ => {
+            if let Some(arg_list) = calling_node.arg_list() {
+                // Number of arguments specified at the call site
+                let num_args_at_callsite = arg_list.args().count();
+
+                let arg_list_range = arg_list.syntax().text_range();
+                if !arg_list_range.contains_inclusive(position.offset) {
+                    tested_by!(call_info_bad_offset);
+                    return None;
+                }
 
-            let mut param = std::cmp::min(
-                num_args_at_callsite,
-                arg_list
-                    .args()
-                    .take_while(|arg| arg.syntax().text_range().end() < position.offset)
-                    .count(),
-            );
-
-            // If we are in a method account for `self`
-            if has_self {
-                param += 1;
-            }
+                let mut param = std::cmp::min(
+                    num_args_at_callsite,
+                    arg_list
+                        .args()
+                        .take_while(|arg| arg.syntax().text_range().end() < position.offset)
+                        .count(),
+                );
+
+                // If we are in a method account for `self`
+                if has_self {
+                    param += 1;
+                }
 
-            call_info.active_parameter = Some(param);
+                call_info.active_parameter = Some(param);
+            }
         }
     }
 
diff --git a/crates/ra_ide/src/completion/complete_dot.rs b/crates/ra_ide/src/completion/complete_dot.rs
index 210a685e4..2ca78c927 100644
--- a/crates/ra_ide/src/completion/complete_dot.rs
+++ b/crates/ra_ide/src/completion/complete_dot.rs
@@ -27,7 +27,7 @@ pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
     complete_methods(acc, ctx, &receiver_ty);
 
     // Suggest .await syntax for types that implement Future trait
-    if ctx.analyzer.impls_future(ctx.db, receiver_ty) {
+    if receiver_ty.impls_future(ctx.db) {
         CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await")
             .detail("expr.await")
             .insert_text("await")
@@ -53,13 +53,16 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: &Ty
 }
 
 fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: &Type) {
-    let mut seen_methods = FxHashSet::default();
-    ctx.analyzer.iterate_method_candidates(ctx.db, receiver, None, |_ty, func| {
-        if func.has_self_param(ctx.db) && seen_methods.insert(func.name(ctx.db)) {
-            acc.add_function(ctx, func);
-        }
-        None::<()>
-    });
+    if let Some(krate) = ctx.module.map(|it| it.krate()) {
+        let mut seen_methods = FxHashSet::default();
+        let traits_in_scope = ctx.analyzer.traits_in_scope(ctx.db);
+        receiver.iterate_method_candidates(ctx.db, krate, &traits_in_scope, None, |_ty, func| {
+            if func.has_self_param(ctx.db) && seen_methods.insert(func.name(ctx.db)) {
+                acc.add_function(ctx, func);
+            }
+            None::<()>
+        });
+    }
 }
 
 #[cfg(test)]
@@ -525,6 +528,7 @@ mod tests {
 
             //- /std/lib.rs
             pub mod future {
+                #[lang = "future_trait"]
                 pub trait Future {}
             }
             "###, CompletionKind::Keyword),
diff --git a/crates/ra_ide/src/completion/complete_path.rs b/crates/ra_ide/src/completion/complete_path.rs
index cc1f7c830..af24e9f48 100644
--- a/crates/ra_ide/src/completion/complete_path.rs
+++ b/crates/ra_ide/src/completion/complete_path.rs
@@ -26,7 +26,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
                     }
                     if let ScopeDef::Unknown = def {
                         if let Some(name_ref) = ctx.name_ref_syntax.as_ref() {
-                            if &name_ref.syntax().text() == name.to_string().as_str() {
+                            if name_ref.syntax().text() == name.to_string().as_str() {
                                 // for `use self::foo<|>`, don't suggest `foo` as a completion
                                 tested_by!(dont_complete_current_use);
                                 continue;
@@ -49,22 +49,24 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
                 hir::ModuleDef::TypeAlias(a) => a.ty(ctx.db),
                 _ => unreachable!(),
             };
-            ctx.analyzer.iterate_path_candidates(ctx.db, &ty, None, |_ty, item| {
-                match item {
-                    hir::AssocItem::Function(func) => {
-                        if !func.has_self_param(ctx.db) {
-                            acc.add_function(ctx, func);
-                        }
-                    }
-                    hir::AssocItem::Const(ct) => acc.add_const(ctx, ct),
-                    hir::AssocItem::TypeAlias(ty) => acc.add_type_alias(ctx, ty),
-                }
-                None::<()>
-            });
             // Iterate assoc types separately
             // FIXME: complete T::AssocType
             let krate = ctx.module.map(|m| m.krate());
             if let Some(krate) = krate {
+                let traits_in_scope = ctx.analyzer.traits_in_scope(ctx.db);
+                ty.iterate_path_candidates(ctx.db, krate, &traits_in_scope, None, |_ty, item| {
+                    match item {
+                        hir::AssocItem::Function(func) => {
+                            if !func.has_self_param(ctx.db) {
+                                acc.add_function(ctx, func);
+                            }
+                        }
+                        hir::AssocItem::Const(ct) => acc.add_const(ctx, ct),
+                        hir::AssocItem::TypeAlias(ty) => acc.add_type_alias(ctx, ty),
+                    }
+                    None::<()>
+                });
+
                 ty.iterate_impl_items(ctx.db, krate, |item| {
                     match item {
                         hir::AssocItem::Function(_) | hir::AssocItem::Const(_) => {}
diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs
index 70b6fde82..930e0c4c2 100644
--- a/crates/ra_ide/src/extend_selection.rs
+++ b/crates/ra_ide/src/extend_selection.rs
@@ -339,7 +339,7 @@ mod tests {
         let (cursor, before) = extract_offset(before);
         let (analysis, file_id) = single_file(&before);
         let range = TextRange::offset_len(cursor, 0.into());
-        let mut frange = FileRange { file_id: file_id, range };
+        let mut frange = FileRange { file_id, range };
 
         for &after in afters {
             frange.range = analysis.extend_selection(frange).unwrap();
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index 4e52e0e7b..2c753dade 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -166,7 +166,7 @@ pub(crate) fn find_all_refs(
     Some(RangeInfo::new(range, ReferenceSearchResult { declaration, references }))
 }
 
-fn find_name<'a>(
+fn find_name(
     db: &RootDatabase,
     syntax: &SyntaxNode,
     position: FilePosition,
@@ -253,13 +253,10 @@ fn decl_access(
     let stmt = find_node_at_offset::<ast::LetStmt>(syntax, range.start())?;
     if let Some(_) = stmt.initializer() {
         let pat = stmt.pat()?;
-        match pat {
-            ast::Pat::BindPat(it) => {
-                if it.name()?.text().as_str() == name {
-                    return Some(ReferenceAccess::Write);
-                }
+        if let ast::Pat::BindPat(it) = pat {
+            if it.name()?.text().as_str() == name {
+                return Some(ReferenceAccess::Write);
             }
-            _ => {}
         }
     }
 
@@ -286,7 +283,7 @@ fn reference_access(kind: &NameKind, name_ref: &ast::NameRef) -> Option<Referenc
                             }
                         }
                     }
-                    return Some(ReferenceAccess::Read);
+                    Some(ReferenceAccess::Read)
                 },
                 _ => {None}
             }
diff --git a/crates/ra_ide/src/references/search_scope.rs b/crates/ra_ide/src/references/search_scope.rs
index 241dd358f..f8211a746 100644
--- a/crates/ra_ide/src/references/search_scope.rs
+++ b/crates/ra_ide/src/references/search_scope.rs
@@ -82,8 +82,7 @@ impl NameDefinition {
             return SearchScope::new(res);
         }
 
-        let vis =
-            self.visibility.as_ref().map(|v| v.syntax().to_string()).unwrap_or("".to_string());
+        let vis = self.visibility.as_ref().map(|v| v.syntax().to_string()).unwrap_or_default();
 
         if vis.as_str() == "pub(super)" {
             if let Some(parent_module) = self.container.parent(db) {