From 490112dea10d476e9b5829499bc6670f03f7d138 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 15 Jan 2019 19:15:01 +0300
Subject: remove Cancelable from nameres

---
 crates/ra_hir/src/db.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/db.rs')

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index d20c03f43..1466c3438 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -87,7 +87,7 @@ pub trait HirDatabase: SyntaxDatabase
         use fn query_definitions::input_module_items;
     }
 
-    fn item_map(source_root_id: SourceRootId) -> Cancelable<Arc<ItemMap>> {
+    fn item_map(source_root_id: SourceRootId) -> Arc<ItemMap> {
         type ItemMapQuery;
         use fn query_definitions::item_map;
     }
-- 
cgit v1.2.3


From fafcd103d26821a8408572514201a40765bb2d2b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 15 Jan 2019 19:18:52 +0300
Subject: remove Cancelable from ids

---
 crates/ra_hir/src/db.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/db.rs')

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 1466c3438..161a5e714 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -97,7 +97,7 @@ pub trait HirDatabase: SyntaxDatabase
         use fn crate::module_tree::ModuleTree::module_tree_query;
     }
 
-    fn impls_in_module(source_root_id: SourceRootId, module_id: ModuleId) -> Cancelable<Arc<ModuleImplBlocks>> {
+    fn impls_in_module(source_root_id: SourceRootId, module_id: ModuleId) -> Arc<ModuleImplBlocks> {
         type ImplsInModuleQuery;
         use fn crate::impl_block::impls_in_module;
     }
-- 
cgit v1.2.3