From 7a46a9949059f24fac211636f95ee914db9a3117 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Fri, 22 May 2020 17:26:31 -0400 Subject: And a few drive-bys --- crates/rust-analyzer/src/config.rs | 6 ++---- crates/rust-analyzer/src/main_loop/handlers.rs | 2 +- crates/rust-analyzer/src/to_proto.rs | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'crates') diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 0e4412ade..c0f7c2c0c 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -269,10 +269,8 @@ impl Config { { self.client_caps.hierarchical_symbols = value } - if let Some(value) = doc_caps - .code_action - .as_ref() - .and_then(|it| Some(it.code_action_literal_support.is_some())) + if let Some(value) = + doc_caps.code_action.as_ref().map(|it| it.code_action_literal_support.is_some()) { self.client_caps.code_action_literals = value; } diff --git a/crates/rust-analyzer/src/main_loop/handlers.rs b/crates/rust-analyzer/src/main_loop/handlers.rs index a9703e1d6..ba6857556 100644 --- a/crates/rust-analyzer/src/main_loop/handlers.rs +++ b/crates/rust-analyzer/src/main_loop/handlers.rs @@ -281,7 +281,7 @@ pub fn handle_document_symbol( kind: symbol.kind, deprecated: symbol.deprecated, location: Location::new(url.clone(), symbol.range), - container_name: container_name, + container_name, }); for child in symbol.children.iter().flatten() { diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 461944ada..7dd7d9416 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs @@ -455,7 +455,7 @@ pub(crate) fn snippet_text_document_edit( let edits = source_file_edit .edit .into_iter() - .map(|it| snippet_text_edit(&line_index, line_endings, is_snippet, it.clone())) + .map(|it| snippet_text_edit(&line_index, line_endings, is_snippet, it)) .collect(); Ok(lsp_ext::SnippetTextDocumentEdit { text_document, edits }) } -- cgit v1.2.3