reduce clones and restrict visibility

Author: AlexWaygood

crates/ty_python_semantic/src/diagnostic/levenshtein.rs

@@ -12,7 +12,7 @@ use std::collections::BTreeSet;
 ///
 /// If the typo itself starts with an underscore, this policy is ignored.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum HideUnderscoredSuggestions {
+pub(super) enum HideUnderscoredSuggestions {
     Yes,
     #[cfg_attr(not(test), expect(dead_code))]
     No,
@@ -24,7 +24,7 @@ impl HideUnderscoredSuggestions {
     }
 }
 
-pub(crate) fn find_best_suggestion<'a, O, I>(
+pub(super) fn find_best_suggestion<'a, O, I>(
     options: O,
     typo: &str,
     hide_underscored_suggestions: HideUnderscoredSuggestions,

crates/ty_python_semantic/src/diagnostic/mod.rs

@@ -12,18 +12,12 @@ use std::fmt::Write;
 pub(crate) mod levenshtein;
 
 /// Suggest a name from `existing_names` that is similar to `wrong_name`.
-pub(crate) fn did_you_mean<S: AsRef<str>, T: AsRef<str>>(
-    existing_names: impl Iterator<Item = S>,
-    wrong_name: T,
-) -> Option<String> {
-    let names: Vec<String> = existing_names.map(|n| n.as_ref().to_string()).collect();
-    let name_refs: Vec<&str> = names.iter().map(String::as_str).collect();
-    find_best_suggestion(
-        name_refs,
-        wrong_name.as_ref(),
-        HideUnderscoredSuggestions::Yes,
-    )
-    .map(str::to_string)
+pub(crate) fn did_you_mean<'a, O, I>(options: O, typo: &str) -> Option<&'a str>
+where
+    O: IntoIterator<IntoIter = I>,
+    I: ExactSizeIterator<Item = &'a str>,
+{
+    find_best_suggestion(options, typo, HideUnderscoredSuggestions::Yes)
 }
 
 /// Add a subdiagnostic to `diagnostic` that explains why a certain Python version was inferred.

crates/ty_python_semantic/src/lint.rs

@@ -389,11 +389,11 @@ impl LintRegistry {
                     }
                 }
 
-                let suggestion = did_you_mean(self.by_name.keys(), code);
+                let suggestion = did_you_mean(self.by_name.keys().copied(), code);
 
                 Err(GetLintError::Unknown {
                     code: code.to_string(),
-                    suggestion,
+                    suggestion: suggestion.map(str::to_string),
                 })
             }
         }

crates/ty_python_semantic/src/types/diagnostic.rs

@@ -4521,7 +4521,7 @@ pub(crate) fn report_invalid_key_on_typed_dict<'db>(
                         .message(format_args!("TypedDict `{typed_dict_name}`"))
                 });
 
-                let existing_keys = items.keys();
+                let existing_keys = items.keys().map(Name::as_str);
                 if let Some(suggestion) = did_you_mean(existing_keys, key) {
                     if let AnyNodeRef::ExprStringLiteral(literal) = key_node {
                         let quoted_suggestion = format!(