4 files changed, 9 insertions, 15 deletions

diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs
index 78bbfcf2d..d7fffc188 100644
--- a/crates/ra_analysis/src/db.rs
+++ b/crates/ra_analysis/src/db.rs
@@ -6,7 +6,6 @@ use ra_syntax::{SourceFileNode, SyntaxNode};
 use salsa::{self, Database};
 
 use crate::{
-    db,
     hir,
     symbol_index::SymbolIndex,
     syntax_ptr::SyntaxPtr,
@@ -59,14 +58,6 @@ impl Default for RootDatabase {
     }
 }
 
-pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> {
-    if db.salsa_runtime().is_current_revision_canceled() {
-        Err(Canceled)
-    } else {
-        Ok(())
-    }
-}
-
 impl salsa::ParallelDatabase for RootDatabase {
     fn snapshot(&self) -> salsa::Snapshot<RootDatabase> {
         salsa::Snapshot::new(RootDatabase {
@@ -80,7 +71,11 @@ impl salsa::ParallelDatabase for RootDatabase {
 pub(crate) trait BaseDatabase: salsa::Database {
     fn id_maps(&self) -> &IdMaps;
     fn check_canceled(&self) -> Cancelable<()> {
-        check_canceled(self)
+        if self.salsa_runtime().is_current_revision_canceled() {
+            Err(Canceled)
+        } else {
+            Ok(())
+        }
     }
 }
 
@@ -171,7 +166,7 @@ fn file_lines(db: &impl SyntaxDatabase, file_id: FileId) -> Arc<LineIndex> {
     Arc::new(LineIndex::new(&*text))
 }
 fn file_symbols(db: &impl SyntaxDatabase, file_id: FileId) -> Cancelable<Arc<SymbolIndex>> {
-    db::check_canceled(db)?;
+    db.check_canceled()?;
     let syntax = db.file_syntax(file_id);
     Ok(Arc::new(SymbolIndex::for_file(file_id, syntax)))
 }
diff --git a/crates/ra_analysis/src/hir/module/imp.rs b/crates/ra_analysis/src/hir/module/imp.rs
index 3b1baff76..d51ca2d59 100644
--- a/crates/ra_analysis/src/hir/module/imp.rs
+++ b/crates/ra_analysis/src/hir/module/imp.rs
@@ -8,7 +8,6 @@ use relative_path::RelativePathBuf;
 use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::{
-    db,
     hir::HirDatabase,
     input::{SourceRoot, SourceRootId},
     Cancelable, FileId, FileResolverImp,
@@ -52,7 +51,7 @@ pub(crate) fn module_tree(
     db: &impl HirDatabase,
     source_root: SourceRootId,
 ) -> Cancelable<Arc<ModuleTree>> {
-    db::check_canceled(db)?;
+    db.check_canceled()?;
     let res = create_module_tree(db, source_root)?;
     Ok(Arc::new(res))
 }
diff --git a/crates/ra_analysis/src/hir/module/nameres.rs b/crates/ra_analysis/src/hir/module/nameres.rs
index 2ff5e0537..d38940085 100644
--- a/crates/ra_analysis/src/hir/module/nameres.rs
+++ b/crates/ra_analysis/src/hir/module/nameres.rs
@@ -248,7 +248,7 @@ where
         }
 
         for &module_id in self.input.keys() {
-            crate::db::check_canceled(self.db)?;
+            self.db.check_canceled()?;
             self.resolve_imports(module_id);
         }
         Ok(self.result)
diff --git a/crates/ra_analysis/src/input.rs b/crates/ra_analysis/src/input.rs
index a78b6e397..60086d1ae 100644
--- a/crates/ra_analysis/src/input.rs
+++ b/crates/ra_analysis/src/input.rs
@@ -33,7 +33,7 @@ impl CrateGraph {
 pub trait FileResolver: fmt::Debug + Send + Sync + 'static {
     fn file_stem(&self, file_id: FileId) -> String;
     fn resolve(&self, file_id: FileId, path: &RelativePath) -> Option<FileId>;
-    fn debug_path(&self, _file_id: FileId) -> Option<std::path::PathBuf> {
+    fn debug_path(&self, _1file_id: FileId) -> Option<std::path::PathBuf> {
         None
     }
 }