about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKirill Bulatov <mail4score@gmail.com>2024-11-25 23:33:04 +0200
committerKirill Bulatov <mail4score@gmail.com>2024-11-25 23:33:04 +0200
commit9ec2404cf8a9a84bb352293a5716c0780d1a4b07 (patch)
treef008169e0b79742e0e6c84019f0381578df70533
parentfac56d731a767204a46ee8d2047da579b546be24 (diff)
downloadrust-9ec2404cf8a9a84bb352293a5716c0780d1a4b07.tar.gz
rust-9ec2404cf8a9a84bb352293a5716c0780d1a4b07.zip
Revert "Less clones"
This reverts commit b82c5ceba8cfb595f3556593fb3eb9cd03b1fb5c.
-rw-r--r--src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs2
-rw-r--r--src/tools/rust-analyzer/crates/rust-analyzer/src/lsp/capabilities.rs8
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 5eab96e2451..80d8c53801f 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 3b19284f241..e5df7947f2d 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 @@ impl ClientCapabilities {
             .unwrap_or_default()
     }
 
-    pub fn inlay_hint_resolve_support_properties(&self) -> FxHashSet<&str> {
+    pub fn inlay_hint_resolve_support_properties(&self) -> FxHashSet<String> {
         self.0
             .text_document
             .as_ref()
@@ -457,11 +457,11 @@ impl ClientCapabilities {
             .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<String> {
         self.0
             .text_document
             .as_ref()
@@ -471,7 +471,7 @@ impl ClientCapabilities {
             .map(|resolve_support| resolve_support.properties.iter())
             .into_iter()
             .flatten()
-            .map(|s| s.as_str())
+            .cloned()
             .collect()
     }