From 9446be29992fe14ec529874622311c3ae7a49b0e Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 15 Jan 2019 18:43:25 +0300
Subject: remove Cancelable from adt API

---
 crates/ra_ide_api/src/completion/complete_dot.rs  | 2 +-
 crates/ra_ide_api/src/completion/complete_path.rs | 2 +-
 crates/ra_ide_api/src/navigation_target.rs        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'crates/ra_ide_api')

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index 37985b398..bf6d91a09 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -29,7 +29,7 @@ fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty)
             Ty::Adt { def_id, .. } => {
                 match def_id.resolve(ctx.db)? {
                     Def::Struct(s) => {
-                        for field in s.fields(ctx.db)? {
+                        for field in s.fields(ctx.db) {
                             CompletionItem::new(
                                 CompletionKind::Reference,
                                 field.name().to_string(),
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index a25ad3f13..6388197be 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -22,7 +22,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) -> C
             }
         }
         hir::Def::Enum(e) => {
-            e.variants(ctx.db)?
+            e.variants(ctx.db)
                 .into_iter()
                 .for_each(|(variant_name, _variant)| {
                     CompletionItem::new(CompletionKind::Reference, variant_name.to_string())
diff --git a/crates/ra_ide_api/src/navigation_target.rs b/crates/ra_ide_api/src/navigation_target.rs
index 7562b9a1f..306dbfd92 100644
--- a/crates/ra_ide_api/src/navigation_target.rs
+++ b/crates/ra_ide_api/src/navigation_target.rs
@@ -112,15 +112,15 @@ impl NavigationTarget {
     pub(crate) fn from_def(db: &RootDatabase, def: Def) -> Cancelable<Option<NavigationTarget>> {
         let res = match def {
             Def::Struct(s) => {
-                let (file_id, node) = s.source(db)?;
+                let (file_id, node) = s.source(db);
                 NavigationTarget::from_named(file_id.original_file(db), &*node)
             }
             Def::Enum(e) => {
-                let (file_id, node) = e.source(db)?;
+                let (file_id, node) = e.source(db);
                 NavigationTarget::from_named(file_id.original_file(db), &*node)
             }
             Def::EnumVariant(ev) => {
-                let (file_id, node) = ev.source(db)?;
+                let (file_id, node) = ev.source(db);
                 NavigationTarget::from_named(file_id.original_file(db), &*node)
             }
             Def::Function(f) => {
-- 
cgit v1.2.3