From 0bb170a277582f5f17c21cddd27a11f19750fa36 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 15 Jan 2019 21:09:51 +0300 Subject: remove Canceled from impl of ra_ide_api --- crates/ra_ide_api/src/completion/complete_scope.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'crates/ra_ide_api/src/completion/complete_scope.rs') diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs index 660c7d16e..699680748 100644 --- a/crates/ra_ide_api/src/completion/complete_scope.rs +++ b/crates/ra_ide_api/src/completion/complete_scope.rs @@ -1,18 +1,15 @@ use rustc_hash::FxHashSet; use ra_syntax::TextUnit; -use crate::{ - Cancelable, - completion::{CompletionItem, CompletionItemKind, Completions, CompletionKind, CompletionContext}, -}; +use crate::completion::{CompletionItem, CompletionItemKind, Completions, CompletionKind, CompletionContext}; -pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) -> Cancelable<()> { +pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) { if !ctx.is_trivial_path { - return Ok(()); + return; } let module = match &ctx.module { Some(it) => it, - None => return Ok(()), + None => return, }; if let Some(function) = &ctx.function { let scopes = function.scopes(ctx.db); @@ -40,7 +37,6 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) -> .from_resolution(ctx, res) .add_to(acc) }); - Ok(()) } fn complete_fn(acc: &mut Completions, scopes: &hir::ScopesWithSyntaxMapping, offset: TextUnit) { -- cgit v1.2.3