1 files changed, 7 insertions, 10 deletions

diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs
index 7ff942f6a..24cb5c752 100644
--- a/crates/ra_hir/src/query_definitions.rs
+++ b/crates/ra_hir/src/query_definitions.rs
@@ -8,7 +8,7 @@ use ra_syntax::{
     AstNode, SyntaxNode, TreeArc,
     ast::{self, ModuleItemOwner}
 };
-use ra_db::{SourceRootId, Cancelable,};
+use ra_db::SourceRootId;
 
 use crate::{
     SourceFileItems, SourceItemId, DefId, HirFileId, ModuleSource,
@@ -18,10 +18,10 @@ use crate::{
     nameres::{InputModuleItems, ItemMap, Resolver},
 };
 
-pub(super) fn fn_scopes(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<FnScopes>> {
-    let body = db.body_hir(def_id)?;
+pub(super) fn fn_scopes(db: &impl HirDatabase, def_id: DefId) -> Arc<FnScopes> {
+    let body = db.body_hir(def_id);
     let res = FnScopes::new(body);
-    Ok(Arc::new(res))
+    Arc::new(res)
 }
 
 pub(super) fn file_items(db: &impl HirDatabase, file_id: HirFileId) -> Arc<SourceFileItems> {
@@ -93,10 +93,7 @@ pub(super) fn input_module_items(
     Arc::new(res)
 }
 
-pub(super) fn item_map(
-    db: &impl HirDatabase,
-    source_root: SourceRootId,
-) -> Cancelable<Arc<ItemMap>> {
+pub(super) fn item_map(db: &impl HirDatabase, source_root: SourceRootId) -> Arc<ItemMap> {
     let start = Instant::now();
     let module_tree = db.module_tree(source_root);
     let input = module_tree
@@ -105,8 +102,8 @@ pub(super) fn item_map(
         .collect::<FxHashMap<_, _>>();
 
     let resolver = Resolver::new(db, &input, source_root, module_tree);
-    let res = resolver.resolve()?;
+    let res = resolver.resolve();
     let elapsed = start.elapsed();
     log::info!("item_map: {:?}", elapsed);
-    Ok(Arc::new(res))
+    Arc::new(res)
 }