From 8338acfd3a9a9e5ab099abd5f01b5c43245daf0a Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 15 Jan 2019 21:17:10 +0300
Subject: kill last cancelables

---
 crates/ra_ide_api/src/imp.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'crates/ra_ide_api/src/imp.rs')

diff --git a/crates/ra_ide_api/src/imp.rs b/crates/ra_ide_api/src/imp.rs
index a21cae624..61771ed40 100644
--- a/crates/ra_ide_api/src/imp.rs
+++ b/crates/ra_ide_api/src/imp.rs
@@ -15,7 +15,6 @@ use ra_syntax::{
 
 use crate::{
     AnalysisChange,
-    Cancelable,
     CrateId, db, Diagnostic, FileId, FilePosition, FileRange, FileSystemEdit,
     Query, RootChange, SourceChange, SourceFileEdit,
     symbol_index::{LibrarySymbolsQuery, FileSymbol},
@@ -158,7 +157,7 @@ impl db::RootDatabase {
         }
     }
 
-    pub(crate) fn diagnostics(&self, file_id: FileId) -> Cancelable<Vec<Diagnostic>> {
+    pub(crate) fn diagnostics(&self, file_id: FileId) -> Vec<Diagnostic> {
         let syntax = self.source_file(file_id);
 
         let mut res = ra_ide_api_light::diagnostics(&syntax)
@@ -219,7 +218,7 @@ impl db::RootDatabase {
                 res.push(diag)
             }
         };
-        Ok(res)
+        res
     }
 
     pub(crate) fn assists(&self, frange: FileRange) -> Vec<SourceChange> {
-- 
cgit v1.2.3