3 files changed, 41 insertions, 10 deletions

diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index 8d2ff561a..e2537758d 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -13,8 +13,11 @@ pub(crate) fn goto_definition(
     let file = db.source_file(position.file_id);
     let syntax = file.syntax();
     if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, position.offset) {
-        let navs = reference_definition(db, position.file_id, name_ref)?;
-        return Ok(Some(RangeInfo::new(name_ref.syntax().range(), navs)));
+        let navs = reference_definition(db, position.file_id, name_ref)?.to_vec();
+        return Ok(Some(RangeInfo::new(
+            name_ref.syntax().range(),
+            navs.to_vec(),
+        )));
     }
     if let Some(name) = find_node_at_offset::<ast::Name>(syntax, position.offset) {
         let navs = ctry!(name_definition(db, position.file_id, name)?);
@@ -23,11 +26,27 @@ pub(crate) fn goto_definition(
     Ok(None)
 }
 
+pub(crate) enum ReferenceResult {
+    Exact(NavigationTarget),
+    Approximate(Vec<NavigationTarget>),
+}
+
+impl ReferenceResult {
+    fn to_vec(self) -> Vec<NavigationTarget> {
+        use self::ReferenceResult::*;
+        match self {
+            Exact(target) => vec![target],
+            Approximate(vec) => vec,
+        }
+    }
+}
+
 pub(crate) fn reference_definition(
     db: &RootDatabase,
     file_id: FileId,
     name_ref: &ast::NameRef,
-) -> Cancelable<Vec<NavigationTarget>> {
+) -> Cancelable<ReferenceResult> {
+    use self::ReferenceResult::*;
     if let Some(fn_descr) =
         hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax())?
     {
@@ -35,7 +54,7 @@ pub(crate) fn reference_definition(
         // First try to resolve the symbol locally
         if let Some(entry) = scope.resolve_local_name(name_ref) {
             let nav = NavigationTarget::from_scope_entry(file_id, &entry);
-            return Ok(vec![nav]);
+            return Ok(Exact(nav));
         };
     }
     // Then try module name resolution
@@ -51,7 +70,7 @@ pub(crate) fn reference_definition(
             let resolved = module.resolve_path(db, &path)?;
             if let Some(def_id) = resolved.take_types().or(resolved.take_values()) {
                 if let Some(target) = NavigationTarget::from_def(db, def_id.resolve(db)?)? {
-                    return Ok(vec![target]);
+                    return Ok(Exact(target));
                 }
             }
         }
@@ -62,7 +81,7 @@ pub(crate) fn reference_definition(
         .into_iter()
         .map(NavigationTarget::from_symbol)
         .collect();
-    Ok(navs)
+    Ok(Approximate(navs))
 }
 
 fn name_definition(
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index b66774cdf..2968b807c 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -16,9 +16,16 @@ pub(crate) fn hover(
 
     let mut range = None;
     if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset) {
-        let navs = crate::goto_definition::reference_definition(db, position.file_id, name_ref)?;
-        for nav in navs {
-            res.extend(doc_text_for(db, nav)?)
+        use crate::goto_definition::{ReferenceResult::*, reference_definition};
+        let ref_result = reference_definition(db, position.file_id, name_ref)?;
+        match ref_result {
+            Exact(nav) => res.extend(doc_text_for(db, nav)?),
+            Approximate(navs) => {
+                res.push("Failed to exactly resolve the symbol. This is probably because rust_analyzer does not yet support glob imports or traits.  \nThese methods were found instead:".to_string());
+                for nav in navs {
+                    res.extend(doc_text_for(db, nav)?)
+                }
+            }
         }
         if !res.is_empty() {
             range = Some(name_ref.syntax().range())
@@ -34,7 +41,7 @@ pub(crate) fn hover(
             file_id: position.file_id,
             range: node.range(),
         };
-        res.extend(type_of(db, frange)?);
+        res.extend(type_of(db, frange)?.map(Into::into));
         range = Some(node.range());
     };
 
diff --git a/crates/ra_ide_api/src/runnables.rs b/crates/ra_ide_api/src/runnables.rs
index 98b1d2d55..53e49da5b 100644
--- a/crates/ra_ide_api/src/runnables.rs
+++ b/crates/ra_ide_api/src/runnables.rs
@@ -17,6 +17,7 @@ pub struct Runnable {
 pub enum RunnableKind {
     Test { name: String },
     TestMod { path: String },
+    Bench { name: String },
     Bin,
 }
 
@@ -48,6 +49,10 @@ fn runnable_fn(fn_def: &ast::FnDef) -> Option<Runnable> {
         RunnableKind::Test {
             name: name.to_string(),
         }
+    } else if fn_def.has_atom_attr("bench") {
+        RunnableKind::Bench {
+            name: name.to_string(),
+        }
     } else {
         return None;
     };