diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 18:18:01 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 18:18:01 +0000 |
commit | ab46f8abf195a78c018d8b23896eb920d16b028b (patch) | |
tree | b82a2973067dffa988e253c4038cdf0e9b0a6963 /crates/ra_ide_api/src/imp.rs | |
parent | 6fba078ab693ec79e887b64e92a7ed3a21e29728 (diff) | |
parent | 8338acfd3a9a9e5ab099abd5f01b5c43245daf0a (diff) |
Merge #558
558: kill last cancelables r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/imp.rs')
-rw-r--r-- | crates/ra_ide_api/src/imp.rs | 5 |
1 files changed, 2 insertions, 3 deletions
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::{ | |||
15 | 15 | ||
16 | use crate::{ | 16 | use crate::{ |
17 | AnalysisChange, | 17 | AnalysisChange, |
18 | Cancelable, | ||
19 | CrateId, db, Diagnostic, FileId, FilePosition, FileRange, FileSystemEdit, | 18 | CrateId, db, Diagnostic, FileId, FilePosition, FileRange, FileSystemEdit, |
20 | Query, RootChange, SourceChange, SourceFileEdit, | 19 | Query, RootChange, SourceChange, SourceFileEdit, |
21 | symbol_index::{LibrarySymbolsQuery, FileSymbol}, | 20 | symbol_index::{LibrarySymbolsQuery, FileSymbol}, |
@@ -158,7 +157,7 @@ impl db::RootDatabase { | |||
158 | } | 157 | } |
159 | } | 158 | } |
160 | 159 | ||
161 | pub(crate) fn diagnostics(&self, file_id: FileId) -> Cancelable<Vec<Diagnostic>> { | 160 | pub(crate) fn diagnostics(&self, file_id: FileId) -> Vec<Diagnostic> { |
162 | let syntax = self.source_file(file_id); | 161 | let syntax = self.source_file(file_id); |
163 | 162 | ||
164 | let mut res = ra_ide_api_light::diagnostics(&syntax) | 163 | let mut res = ra_ide_api_light::diagnostics(&syntax) |
@@ -219,7 +218,7 @@ impl db::RootDatabase { | |||
219 | res.push(diag) | 218 | res.push(diag) |
220 | } | 219 | } |
221 | }; | 220 | }; |
222 | Ok(res) | 221 | res |
223 | } | 222 | } |
224 | 223 | ||
225 | pub(crate) fn assists(&self, frange: FileRange) -> Vec<SourceChange> { | 224 | pub(crate) fn assists(&self, frange: FileRange) -> Vec<SourceChange> { |