diff --git a/crates/ra_analysis/src/completion.rs b/crates/ra_analysis/src/completion.rs
index 074033ad890..09894d9553c 100644
--- a/crates/ra_analysis/src/completion.rs
+++ b/crates/ra_analysis/src/completion.rs
@@ -24,7 +24,7 @@ pub use crate::completion::completion_item::{CompletionItem, InsertText};
 pub(crate) fn completions(
     db: &db::RootDatabase,
     position: FilePosition,
-) -> Cancelable<Option<Vec<CompletionItem>>> {
+) -> Cancelable<Option<Completions>> {
     let original_file = db.source_file(position.file_id);
     // Insert a fake ident to get a valid parse tree
     let file = {
@@ -53,12 +53,10 @@ pub(crate) fn completions(
             param_completions(&mut acc, name.syntax());
         }
     }
-    let res = if has_completions {
-        Some(acc.into())
-    } else {
-        None
-    };
-    Ok(res)
+    if !has_completions {
+        return Ok(None);
+    }
+    Ok(Some(acc))
 }
 
 /// Complete repeated parametes, both name and type. For example, if all
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
index 5701e1ae233..340f7c78c9c 100644
--- a/crates/ra_analysis/src/imp.rs
+++ b/crates/ra_analysis/src/imp.rs
@@ -219,7 +219,8 @@ impl AnalysisImpl {
         self.db.crate_graph().crate_root(crate_id)
     }
     pub fn completions(&self, position: FilePosition) -> Cancelable<Option<Vec<CompletionItem>>> {
-        completions(&self.db, position)
+        let completions = completions(&self.db, position)?;
+        Ok(completions.map(|it| it.into()))
     }
     pub fn approximately_resolve_symbol(
         &self,