diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 15:19:40 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 15:19:40 +0000 |
commit | 91feed736f91a3790b2f5a5d0d879c06843bce95 (patch) | |
tree | 6a71bcb433b82e4c473238d439aad2ef76144157 /crates/ra_ide_api/src/lib.rs | |
parent | a36b2cf377a90cf13bb097e57878b8384d30c53a (diff) | |
parent | fb012e5c1e49af73b480127bcf56d8f5993b8032 (diff) |
Merge #550
550: remove Cancelable from source binders r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/lib.rs')
-rw-r--r-- | crates/ra_ide_api/src/lib.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index abb50ff95..e0b8410d1 100644 --- a/crates/ra_ide_api/src/lib.rs +++ b/crates/ra_ide_api/src/lib.rs | |||
@@ -381,12 +381,11 @@ impl Analysis { | |||
381 | /// Fuzzy searches for a symbol. | 381 | /// Fuzzy searches for a symbol. |
382 | pub fn symbol_search(&self, query: Query) -> Cancelable<Vec<NavigationTarget>> { | 382 | pub fn symbol_search(&self, query: Query) -> Cancelable<Vec<NavigationTarget>> { |
383 | self.with_db(|db| { | 383 | self.with_db(|db| { |
384 | let res = symbol_index::world_symbols(db, query)? | 384 | symbol_index::world_symbols(db, query) |
385 | .into_iter() | 385 | .into_iter() |
386 | .map(NavigationTarget::from_symbol) | 386 | .map(NavigationTarget::from_symbol) |
387 | .collect::<Vec<_>>(); | 387 | .collect::<Vec<_>>() |
388 | Ok(res) | 388 | }) |
389 | })? | ||
390 | } | 389 | } |
391 | 390 | ||
392 | pub fn goto_definition( | 391 | pub fn goto_definition( |