4 files changed, 56 insertions, 57 deletions

diff --git a/crates/ra_ide_db/src/change.rs b/crates/ra_ide_db/src/change.rs
index b507000f2..dbe6eacc5 100644
--- a/crates/ra_ide_db/src/change.rs
+++ b/crates/ra_ide_db/src/change.rs
@@ -243,8 +243,9 @@ impl RootDatabase {
             hir::db::GenericPredicatesForParamQuery
             hir::db::GenericPredicatesQuery
             hir::db::GenericDefaultsQuery
-            hir::db::ImplsInCrateQuery
-            hir::db::ImplsFromDepsQuery
+            hir::db::InherentImplsInCrateQuery
+            hir::db::TraitImplsInCrateQuery
+            hir::db::TraitImplsInDepsQuery
             hir::db::InternTypeCtorQuery
             hir::db::InternTypeParamIdQuery
             hir::db::InternChalkImplQuery
diff --git a/crates/ra_ide_db/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs
index fff112e66..1fba71ff8 100644
--- a/crates/ra_ide_db/src/imports_locator.rs
+++ b/crates/ra_ide_db/src/imports_locator.rs
@@ -13,57 +13,53 @@ use crate::{
 use either::Either;
 use rustc_hash::FxHashSet;
 
-pub struct ImportsLocator<'a> {
-    sema: Semantics<'a, RootDatabase>,
+pub fn find_imports<'a>(
+    sema: &Semantics<'a, RootDatabase>,
     krate: Crate,
-}
-
-impl<'a> ImportsLocator<'a> {
-    pub fn new(db: &'a RootDatabase, krate: Crate) -> Self {
-        Self { sema: Semantics::new(db), krate }
-    }
+    name_to_import: &str,
+) -> Vec<Either<ModuleDef, MacroDef>> {
+    let _p = profile("search_for_imports");
+    let db = sema.db;
 
-    pub fn find_imports(&mut self, name_to_import: &str) -> Vec<Either<ModuleDef, MacroDef>> {
-        let _p = profile("search_for_imports");
-        let db = self.sema.db;
+    // Query dependencies first.
+    let mut candidates: FxHashSet<_> =
+        krate.query_external_importables(db, name_to_import).collect();
 
-        // Query dependencies first.
-        let mut candidates: FxHashSet<_> =
-            self.krate.query_external_importables(db, name_to_import).collect();
+    // Query the local crate using the symbol index.
+    let local_results = {
+        let mut query = Query::new(name_to_import.to_string());
+        query.exact();
+        query.limit(40);
+        symbol_index::crate_symbols(db, krate.into(), query)
+    };
 
-        // Query the local crate using the symbol index.
-        let local_results = {
-            let mut query = Query::new(name_to_import.to_string());
-            query.exact();
-            query.limit(40);
-            symbol_index::crate_symbols(db, self.krate.into(), query)
-        };
+    candidates.extend(
+        local_results
+            .into_iter()
+            .filter_map(|import_candidate| get_name_definition(sema, &import_candidate))
+            .filter_map(|name_definition_to_import| match name_definition_to_import {
+                Definition::ModuleDef(module_def) => Some(Either::Left(module_def)),
+                Definition::Macro(macro_def) => Some(Either::Right(macro_def)),
+                _ => None,
+            }),
+    );
 
-        candidates.extend(
-            local_results
-                .into_iter()
-                .filter_map(|import_candidate| self.get_name_definition(&import_candidate))
-                .filter_map(|name_definition_to_import| match name_definition_to_import {
-                    Definition::ModuleDef(module_def) => Some(Either::Left(module_def)),
-                    Definition::Macro(macro_def) => Some(Either::Right(macro_def)),
-                    _ => None,
-                }),
-        );
-
-        candidates.into_iter().collect()
-    }
+    candidates.into_iter().collect()
+}
 
-    fn get_name_definition(&mut self, import_candidate: &FileSymbol) -> Option<Definition> {
-        let _p = profile("get_name_definition");
-        let file_id = import_candidate.file_id;
+fn get_name_definition<'a>(
+    sema: &Semantics<'a, RootDatabase>,
+    import_candidate: &FileSymbol,
+) -> Option<Definition> {
+    let _p = profile("get_name_definition");
+    let file_id = import_candidate.file_id;
 
-        let candidate_node = import_candidate.ptr.to_node(self.sema.parse(file_id).syntax());
-        let candidate_name_node = if candidate_node.kind() != NAME {
-            candidate_node.children().find(|it| it.kind() == NAME)?
-        } else {
-            candidate_node
-        };
-        let name = ast::Name::cast(candidate_name_node)?;
-        classify_name(&self.sema, &name)?.into_definition()
-    }
+    let candidate_node = import_candidate.ptr.to_node(sema.parse(file_id).syntax());
+    let candidate_name_node = if candidate_node.kind() != NAME {
+        candidate_node.children().find(|it| it.kind() == NAME)?
+    } else {
+        candidate_node
+    };
+    let name = ast::Name::cast(candidate_name_node)?;
+    classify_name(sema, &name)?.into_definition()
 }
diff --git a/crates/ra_ide_db/src/lib.rs b/crates/ra_ide_db/src/lib.rs
index a808de4f1..c78071ad6 100644
--- a/crates/ra_ide_db/src/lib.rs
+++ b/crates/ra_ide_db/src/lib.rs
@@ -13,7 +13,7 @@ mod wasm_shims;
 
 use std::sync::Arc;
 
-use hir::db::{AstDatabase, DefDatabase};
+use hir::db::{AstDatabase, DefDatabase, HirDatabase};
 use ra_db::{
     salsa::{self, Database, Durability},
     Canceled, CheckCanceled, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase,
@@ -52,6 +52,12 @@ impl Upcast<dyn DefDatabase> for RootDatabase {
     }
 }
 
+impl Upcast<dyn HirDatabase> for RootDatabase {
+    fn upcast(&self) -> &(dyn HirDatabase + 'static) {
+        &*self
+    }
+}
+
 impl FileLoader for RootDatabase {
     fn file_text(&self, file_id: FileId) -> Arc<String> {
         FileLoaderDelegate(self).file_text(file_id)
diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs
index 44d5c35e6..81553150b 100644
--- a/crates/ra_ide_db/src/search.rs
+++ b/crates/ra_ide_db/src/search.rs
@@ -180,20 +180,20 @@ impl Definition {
 
     pub fn find_usages(
         &self,
-        db: &RootDatabase,
+        sema: &Semantics<RootDatabase>,
         search_scope: Option<SearchScope>,
     ) -> Vec<Reference> {
         let _p = profile("Definition::find_usages");
 
         let search_scope = {
-            let base = self.search_scope(db);
+            let base = self.search_scope(sema.db);
             match search_scope {
                 None => base,
                 Some(scope) => base.intersection(&scope),
             }
         };
 
-        let name = match self.name(db) {
+        let name = match self.name(sema.db) {
             None => return Vec::new(),
             Some(it) => it.to_string(),
         };
@@ -202,11 +202,10 @@ impl Definition {
         let mut refs = vec![];
 
         for (file_id, search_range) in search_scope {
-            let text = db.file_text(file_id);
+            let text = sema.db.file_text(file_id);
             let search_range =
                 search_range.unwrap_or(TextRange::up_to(TextSize::of(text.as_str())));
 
-            let sema = Semantics::new(db);
             let tree = Lazy::new(|| sema.parse(file_id).syntax().clone());
 
             for (idx, _) in text.match_indices(pat) {
@@ -222,9 +221,6 @@ impl Definition {
                         continue;
                     };
 
-                // FIXME: reuse sb
-                // See https://github.com/rust-lang/rust/pull/68198#issuecomment-574269098
-
                 match classify_name_ref(&sema, &name_ref) {
                     Some(NameRefClass::Definition(def)) if &def == self => {
                         let kind = if is_record_lit_name_ref(&name_ref)