From 9ec2404cf8a9a84bb352293a5716c0780d1a4b07 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Mon, 25 Nov 2024 23:33:04 +0200 Subject: [PATCH] Revert "Less clones" This reverts commit b82c5ceba8cfb595f3556593fb3eb9cd03b1fb5c. --- .../crates/rust-analyzer/src/handlers/request.rs | 2 +- .../crates/rust-analyzer/src/lsp/capabilities.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs index 5eab96e24517..80d8c53801f1 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs @@ -1061,7 +1061,7 @@ pub(crate) fn handle_completion_resolve( let position = FilePosition { file_id, offset }; let Some(unresolved_completions) = snap.analysis.completions( - &forced_resolve_completions_config, + &&forced_resolve_completions_config, position, resolve_data.trigger_character, )? diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs index 3b19284f2411..e5df7947f2d7 100644 --- a/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs +++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs @@ -448,7 +448,7 @@ pub fn inlay_hints_refresh(&self) -> bool { .unwrap_or_default() } - pub fn inlay_hint_resolve_support_properties(&self) -> FxHashSet<&str> { + pub fn inlay_hint_resolve_support_properties(&self) -> FxHashSet { self.0 .text_document .as_ref() @@ -457,11 +457,11 @@ pub fn inlay_hint_resolve_support_properties(&self) -> FxHashSet<&str> { .map(|inlay_resolve| inlay_resolve.properties.iter()) .into_iter() .flatten() - .map(|s| s.as_str()) + .cloned() .collect() } - pub fn completion_resolve_support_properties(&self) -> FxHashSet<&str> { + pub fn completion_resolve_support_properties(&self) -> FxHashSet { self.0 .text_document .as_ref() @@ -471,7 +471,7 @@ pub fn completion_resolve_support_properties(&self) -> FxHashSet<&str> { .map(|resolve_support| resolve_support.properties.iter()) .into_iter() .flatten() - .map(|s| s.as_str()) + .cloned() .collect() }