From 9dd4099d9388b5f61e99f923dd6c523f76ad43ff Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 15 Jan 2019 18:45:01 +0300
Subject: remove Cancelable from static&const API

---
 crates/ra_hir/src/code_model_api.rs        | 19 ++++++++-----------
 crates/ra_ide_api/src/navigation_target.rs |  8 ++++----
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs
index cd61d922b..f6d1d6b23 100644
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -333,8 +333,8 @@ impl Const {
         Const { def_id }
     }
 
-    pub fn source(&self, db: &impl HirDatabase) -> Cancelable<(HirFileId, TreeArc<ast::ConstDef>)> {
-        Ok(def_id_to_ast(db, self.def_id))
+    pub fn source(&self, db: &impl HirDatabase) -> (HirFileId, TreeArc<ast::ConstDef>) {
+        def_id_to_ast(db, self.def_id)
     }
 }
 
@@ -348,11 +348,8 @@ impl Static {
         Static { def_id }
     }
 
-    pub fn source(
-        &self,
-        db: &impl HirDatabase,
-    ) -> Cancelable<(HirFileId, TreeArc<ast::StaticDef>)> {
-        Ok(def_id_to_ast(db, self.def_id))
+    pub fn source(&self, db: &impl HirDatabase) -> (HirFileId, TreeArc<ast::StaticDef>) {
+        def_id_to_ast(db, self.def_id)
     }
 }
 
@@ -366,8 +363,8 @@ impl Trait {
         Trait { def_id }
     }
 
-    pub fn source(&self, db: &impl HirDatabase) -> Cancelable<(HirFileId, TreeArc<ast::TraitDef>)> {
-        Ok(def_id_to_ast(db, self.def_id))
+    pub fn source(&self, db: &impl HirDatabase) -> (HirFileId, TreeArc<ast::TraitDef>) {
+        def_id_to_ast(db, self.def_id)
     }
 }
 
@@ -381,7 +378,7 @@ impl Type {
         Type { def_id }
     }
 
-    pub fn source(&self, db: &impl HirDatabase) -> Cancelable<(HirFileId, TreeArc<ast::TypeDef>)> {
-        Ok(def_id_to_ast(db, self.def_id))
+    pub fn source(&self, db: &impl HirDatabase) -> (HirFileId, TreeArc<ast::TypeDef>) {
+        def_id_to_ast(db, self.def_id)
     }
 }
diff --git a/crates/ra_ide_api/src/navigation_target.rs b/crates/ra_ide_api/src/navigation_target.rs
index 306dbfd92..965dfc0ca 100644
--- a/crates/ra_ide_api/src/navigation_target.rs
+++ b/crates/ra_ide_api/src/navigation_target.rs
@@ -128,19 +128,19 @@ impl NavigationTarget {
                 NavigationTarget::from_named(file_id.original_file(db), &*node)
             }
             Def::Trait(f) => {
-                let (file_id, node) = f.source(db)?;
+                let (file_id, node) = f.source(db);
                 NavigationTarget::from_named(file_id.original_file(db), &*node)
             }
             Def::Type(f) => {
-                let (file_id, node) = f.source(db)?;
+                let (file_id, node) = f.source(db);
                 NavigationTarget::from_named(file_id.original_file(db), &*node)
             }
             Def::Static(f) => {
-                let (file_id, node) = f.source(db)?;
+                let (file_id, node) = f.source(db);
                 NavigationTarget::from_named(file_id.original_file(db), &*node)
             }
             Def::Const(f) => {
-                let (file_id, node) = f.source(db)?;
+                let (file_id, node) = f.source(db);
                 NavigationTarget::from_named(file_id.original_file(db), &*node)
             }
             Def::Module(m) => NavigationTarget::from_module(db, m)?,
-- 
cgit v1.2.3