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/completion | |
| 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/completion')
| -rw-r--r-- | crates/ra_ide_api/src/completion/completion_context.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs index 113f6c070..f5b5ed689 100644 --- a/crates/ra_ide_api/src/completion/completion_context.rs +++ b/crates/ra_ide_api/src/completion/completion_context.rs | |||
| @@ -42,7 +42,7 @@ impl<'a> CompletionContext<'a> { | |||
| 42 | original_file: &'a SourceFile, | 42 | original_file: &'a SourceFile, |
| 43 | position: FilePosition, | 43 | position: FilePosition, |
| 44 | ) -> Cancelable<Option<CompletionContext<'a>>> { | 44 | ) -> Cancelable<Option<CompletionContext<'a>>> { |
| 45 | let module = source_binder::module_from_position(db, position)?; | 45 | let module = source_binder::module_from_position(db, position); |
| 46 | let leaf = | 46 | let leaf = |
| 47 | ctry!(find_leaf_at_offset(original_file.syntax(), position.offset).left_biased()); | 47 | ctry!(find_leaf_at_offset(original_file.syntax(), position.offset).left_biased()); |
| 48 | let mut ctx = CompletionContext { | 48 | let mut ctx = CompletionContext { |