Avoid &String type and un-necessary cloning

Summary: As per title. Suggested in D54633456. Reviewed By: michalmuskala, alanz Differential Revision: D54635043 fbshipit-source-id: 5b4cc1c1e635ec8c71e78ab32955709c2d3554ae
WhatsApp · Mar 8, 2024 · 263b584 · 263b584
1 parent 44ca9b6
commit 263b584
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/crates/elp/src/config.rs b/crates/elp/src/config.rs
@@ -210,7 +210,7 @@ impl Config {
             .data
             .diagnostics_disabled
             .iter()
-            .filter_map(DiagnosticCode::maybe_from_string)
+            .filter_map(|code| DiagnosticCode::maybe_from_string(&code))
         {
             config = config.disable(code);
         }

diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
@@ -176,7 +176,7 @@ impl DiagnosticCode {
         format!("{} ({})", self.as_code(), self.as_label())
     }
 
-    pub fn maybe_from_string(s: &String) -> Option<DiagnosticCode> {
+    pub fn maybe_from_string(s: &str) -> Option<DiagnosticCode> {
         DIAGNOSTIC_CODE_LOOKUPS
             .get(s).cloned()
             // @fb-only: .or_else(|| MetaOnlyDiagnosticCode::from_str(s).ok().map(DiagnosticCode::MetaOnly))
@@ -255,7 +255,7 @@ lazy_static! {
 impl FromStr for DiagnosticCode {
     type Err = String;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if let Some(code) = DiagnosticCode::maybe_from_string(&s.to_string()) {
+        if let Some(code) = DiagnosticCode::maybe_from_string(s) {
             Ok(code)
         } else {
             Err(format!("Unknown DiagnosticCode: '{s}'"))
@@ -290,7 +290,7 @@ mod tests {
         let strings = vec!["W0008", "unreachable_test"];
         let codes = strings
             .iter()
-            .map(|s| DiagnosticCode::maybe_from_string(&s.to_string()))
+            .map(|s| DiagnosticCode::maybe_from_string(s))
             .collect::<Vec<_>>();
         expect![[r#"
             [
@@ -313,7 +313,7 @@ mod tests {
         ];
         let codes = strings
             .iter()
-            .map(|s| DiagnosticCode::maybe_from_string(&s.to_string()))
+            .map(|s| DiagnosticCode::maybe_from_string(s))
             .collect::<Vec<_>>();
         expect![[r#"
             [
@@ -337,7 +337,7 @@ mod tests {
         let strings = vec!["C1000", "L1213"];
         let codes = strings
             .iter()
-            .map(|s| DiagnosticCode::maybe_from_string(&s.to_string()))
+            .map(|s| DiagnosticCode::maybe_from_string(s))
             .collect::<Vec<_>>();
         expect![[r#"
             [

diff --git a/crates/ide_db/src/metadata.rs b/crates/ide_db/src/metadata.rs
@@ -122,7 +122,7 @@ fn collect_fixmes(
                     let comment_range = TextRange::new(pattern_start, pattern_end);
                     let codes = comment
                         .split_whitespace()
-                        .filter_map(|word| DiagnosticCode::maybe_from_string(&word.to_string()))
+                        .filter_map(|word| DiagnosticCode::maybe_from_string(word))
                         .collect();
 
                     fixmes.push(Fixme {