From eceaf94f1936436e33ae235ca65bf2a6d4f77da5 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Tue, 18 Feb 2020 15:32:19 +0200 Subject: More manual clippy fixes --- crates/ra_ide/src/completion/complete_trait_impl.rs | 8 ++++---- crates/ra_ide/src/completion/completion_item.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_ide/src/completion') diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs index 6ff10c017..83628e35c 100644 --- a/crates/ra_ide/src/completion/complete_trait_impl.rs +++ b/crates/ra_ide/src/completion/complete_trait_impl.rs @@ -59,7 +59,7 @@ pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext .as_ref() .and_then(|node| node.parent()) .and_then(|node| node.parent()) - .and_then(|node| ast::ImplBlock::cast(node)); + .and_then(ast::ImplBlock::cast); if let (Some(trigger), Some(impl_block)) = (trigger, impl_block) { match trigger.kind() { @@ -110,17 +110,17 @@ fn add_function_impl( ctx: &CompletionContext, func: &hir::Function, ) { - let display = FunctionSignature::from_hir(ctx.db, func.clone()); + let display = FunctionSignature::from_hir(ctx.db, *func); let fn_name = func.name(ctx.db).to_string(); - let label = if func.params(ctx.db).len() > 0 { + let label = if !func.params(ctx.db).is_empty() { format!("fn {}(..)", fn_name) } else { format!("fn {}()", fn_name) }; - let builder = CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label.clone()) + let builder = CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label) .lookup_by(fn_name) .set_documentation(func.docs(ctx.db)); diff --git a/crates/ra_ide/src/completion/completion_item.rs b/crates/ra_ide/src/completion/completion_item.rs index 93f336370..61867c0ff 100644 --- a/crates/ra_ide/src/completion/completion_item.rs +++ b/crates/ra_ide/src/completion/completion_item.rs @@ -159,7 +159,7 @@ impl CompletionItem { /// Short one-line additional information, like a type pub fn detail(&self) -> Option<&str> { - self.detail.as_ref().map(|it| it.as_str()) + self.detail.as_deref() } /// A doc-comment pub fn documentation(&self) -> Option { @@ -167,7 +167,7 @@ impl CompletionItem { } /// What string is used for filtering. pub fn lookup(&self) -> &str { - self.lookup.as_ref().map(|it| it.as_str()).unwrap_or_else(|| self.label()) + self.lookup.as_deref().unwrap_or_else(|| self.label()) } pub fn kind(&self) -> Option { -- cgit v1.2.3