aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis/src/hir/module
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_analysis/src/hir/module')
-rw-r--r--crates/ra_analysis/src/hir/module/imp.rs3
-rw-r--r--crates/ra_analysis/src/hir/module/nameres.rs2
2 files changed, 2 insertions, 3 deletions
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;
8use rustc_hash::{FxHashMap, FxHashSet}; 8use rustc_hash::{FxHashMap, FxHashSet};
9 9
10use crate::{ 10use crate::{
11 db,
12 hir::HirDatabase, 11 hir::HirDatabase,
13 input::{SourceRoot, SourceRootId}, 12 input::{SourceRoot, SourceRootId},
14 Cancelable, FileId, FileResolverImp, 13 Cancelable, FileId, FileResolverImp,
@@ -52,7 +51,7 @@ pub(crate) fn module_tree(
52 db: &impl HirDatabase, 51 db: &impl HirDatabase,
53 source_root: SourceRootId, 52 source_root: SourceRootId,
54) -> Cancelable<Arc<ModuleTree>> { 53) -> Cancelable<Arc<ModuleTree>> {
55 db::check_canceled(db)?; 54 db.check_canceled()?;
56 let res = create_module_tree(db, source_root)?; 55 let res = create_module_tree(db, source_root)?;
57 Ok(Arc::new(res)) 56 Ok(Arc::new(res))
58} 57}
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
248 } 248 }
249 249
250 for &module_id in self.input.keys() { 250 for &module_id in self.input.keys() {
251 crate::db::check_canceled(self.db)?; 251 self.db.check_canceled()?;
252 self.resolve_imports(module_id); 252 self.resolve_imports(module_id);
253 } 253 }
254 Ok(self.result) 254 Ok(self.result)