From ca52cf1ecd4f65ff2a8c3953c35b006e73a60ea8 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 15 Jan 2019 18:26:29 +0300
Subject: remove Cancelable from Module API

---
 crates/ra_ide_api/src/completion/complete_scope.rs | 2 +-
 crates/ra_ide_api/src/navigation_target.rs         | 8 ++++----
 crates/ra_ide_api/src/runnables.rs                 | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'crates/ra_ide_api/src')

diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 770a0fdf2..f422bb9a7 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -20,7 +20,7 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) ->
     }
 
     let module_scope = module.scope(ctx.db)?;
-    let (file_id, _) = module.definition_source(ctx.db)?;
+    let (file_id, _) = module.definition_source(ctx.db);
     module_scope
         .entries()
         .filter(|(_name, res)| {
diff --git a/crates/ra_ide_api/src/navigation_target.rs b/crates/ra_ide_api/src/navigation_target.rs
index 230d0f67a..7562b9a1f 100644
--- a/crates/ra_ide_api/src/navigation_target.rs
+++ b/crates/ra_ide_api/src/navigation_target.rs
@@ -73,9 +73,9 @@ impl NavigationTarget {
         db: &RootDatabase,
         module: hir::Module,
     ) -> Cancelable<NavigationTarget> {
-        let (file_id, source) = module.definition_source(db)?;
+        let (file_id, source) = module.definition_source(db);
         let name = module
-            .name(db)?
+            .name(db)
             .map(|it| it.to_string().into())
             .unwrap_or_default();
         let res = match source {
@@ -94,10 +94,10 @@ impl NavigationTarget {
         module: hir::Module,
     ) -> Cancelable<NavigationTarget> {
         let name = module
-            .name(db)?
+            .name(db)
             .map(|it| it.to_string().into())
             .unwrap_or_default();
-        if let Some((file_id, source)) = module.declaration_source(db)? {
+        if let Some((file_id, source)) = module.declaration_source(db) {
             return Ok(NavigationTarget::from_syntax(
                 file_id,
                 name,
diff --git a/crates/ra_ide_api/src/runnables.rs b/crates/ra_ide_api/src/runnables.rs
index 9fa0f79a6..c0d4bda94 100644
--- a/crates/ra_ide_api/src/runnables.rs
+++ b/crates/ra_ide_api/src/runnables.rs
@@ -83,8 +83,7 @@ fn runnable_mod(db: &RootDatabase, file_id: FileId, module: &ast::Module) -> Opt
         .ok()?
         .into_iter()
         .rev()
-        .filter_map(|it| it.name(db).ok())
-        .filter_map(|it| it)
+        .filter_map(|it| it.name(db))
         .join("::");
     Some(Runnable {
         range,
-- 
cgit v1.2.3