From 4c9933c01657349438f9170c2ef7d6352144b224 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 28 Nov 2018 01:38:39 +0300 Subject: check_canceled is a method --- crates/ra_analysis/src/hir/module/imp.rs | 3 +-- crates/ra_analysis/src/hir/module/nameres.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'crates/ra_analysis/src/hir') 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> { - 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) -- cgit v1.2.3