clippy_dev: Only build AhoCorasick searcher once for multiple files.

Author: Jarcho

clippy_dev/src/rename_lint.rs

@@ -1,9 +1,7 @@
 use crate::update_lints::{
     RenamedLint, clippy_lints_src_files, gather_all, gen_renamed_lints_test_fn, generate_lint_files,
 };
-use crate::utils::{
-    FileUpdater, UpdateMode, Version, insert_at_marker, replace_ident_like, rewrite_file, try_rename_file,
-};
+use crate::utils::{FileUpdater, StringReplacer, UpdateMode, Version, insert_at_marker, rewrite_file, try_rename_file};
 use std::ffi::OsStr;
 use std::path::Path;
 use walkdir::WalkDir;
@@ -66,16 +64,16 @@ pub fn rename(clippy_version: Version, old_name: &str, new_name: &str, uplift: b
     );
 
     // Update all lint level attributes. (`clippy::lint_name`)
+    let replacements = &[(&*lint.old_name, &*lint.new_name)];
+    let replacer = StringReplacer::new(replacements);
     for file in WalkDir::new(".").into_iter().map(Result::unwrap).filter(|f| {
         let name = f.path().file_name();
         let ext = f.path().extension();
         (ext == Some(OsStr::new("rs")) || ext == Some(OsStr::new("fixed")))
             && name != Some(OsStr::new("rename.rs"))
             && name != Some(OsStr::new("deprecated_lints.rs"))
     }) {
-        updater.update_file(file.path(), &mut |_, src, dst| {
-            replace_ident_like(&[(&lint.old_name, &lint.new_name)], src, dst)
-        });
+        updater.update_file(file.path(), &mut replacer.replace_ident_fn());
     }
 
     rewrite_file(Path::new("clippy_lints/src/deprecated_lints.rs"), |s| {
@@ -167,16 +165,15 @@ pub fn rename(clippy_version: Version, old_name: &str, new_name: &str, uplift: b
 
         // Don't change `clippy_utils/src/renamed_lints.rs` here as it would try to edit the lint being
         // renamed.
+        let replacer = StringReplacer::new(replacements);
         for file in clippy_lints_src_files() {
             if file
                 .path()
                 .as_os_str()
                 .to_str()
                 .is_none_or(|x| x["clippy_lints/src/".len()..] != *"deprecated_lints.rs")
             {
-                updater.update_file(file.path(), &mut |_, src, dst| {
-                    replace_ident_like(replacements, src, dst)
-                });
+                updater.update_file(file.path(), &mut replacer.replace_ident_fn());
             }
         }
 

clippy_dev/src/utils.rs

@@ -1,4 +1,4 @@
-use aho_corasick::AhoCorasickBuilder;
+use aho_corasick::{AhoCorasick, AhoCorasickBuilder};
 use core::fmt::{self, Display};
 use core::str::FromStr;
 use std::env;
@@ -344,33 +344,46 @@ pub fn update_text_region_fn(
     move |path, src, dst| update_text_region(path, start, end, src, dst, &mut insert)
 }
 
-/// Replace substrings if they aren't bordered by identifier characters. Returns `None` if there
-/// were no replacements.
 #[must_use]
-pub fn replace_ident_like(replacements: &[(&str, &str)], src: &str, dst: &mut String) -> UpdateStatus {
-    fn is_ident_char(c: u8) -> bool {
-        matches!(c, b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'_')
-    }
+pub fn is_ident_char(c: u8) -> bool {
+    matches!(c, b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'_')
+}
 
-    let searcher = AhoCorasickBuilder::new()
-        .match_kind(aho_corasick::MatchKind::LeftmostLongest)
-        .build(replacements.iter().map(|&(x, _)| x.as_bytes()))
-        .unwrap();
+pub struct StringReplacer<'a> {
+    searcher: AhoCorasick,
+    replacements: &'a [(&'a str, &'a str)],
+}
+impl<'a> StringReplacer<'a> {
+    #[must_use]
+    pub fn new(replacements: &'a [(&'a str, &'a str)]) -> Self {
+        Self {
+            searcher: AhoCorasickBuilder::new()
+                .match_kind(aho_corasick::MatchKind::LeftmostLongest)
+                .build(replacements.iter().map(|&(x, _)| x))
+                .unwrap(),
+            replacements,
+        }
+    }
 
-    let mut pos = 0;
-    let mut changed = false;
-    for m in searcher.find_iter(src) {
-        if !is_ident_char(src.as_bytes().get(m.start().wrapping_sub(1)).copied().unwrap_or(0))
-            && !is_ident_char(src.as_bytes().get(m.end()).copied().unwrap_or(0))
-        {
-            dst.push_str(&src[pos..m.start()]);
-            dst.push_str(replacements[m.pattern()].1);
-            pos = m.end();
-            changed = true;
+    /// Replace substrings if they aren't bordered by identifier characters.
+    pub fn replace_ident_fn(&self) -> impl Fn(&Path, &str, &mut String) -> UpdateStatus {
+        move |_, src, dst| {
+            let mut pos = 0;
+            let mut changed = false;
+            for m in self.searcher.find_iter(src) {
+                if !is_ident_char(src.as_bytes().get(m.start().wrapping_sub(1)).copied().unwrap_or(0))
+                    && !is_ident_char(src.as_bytes().get(m.end()).copied().unwrap_or(0))
+                {
+                    changed = true;
+                    dst.push_str(&src[pos..m.start()]);
+                    dst.push_str(self.replacements[m.pattern()].1);
+                    pos = m.end();
+                }
+            }
+            dst.push_str(&src[pos..]);
+            UpdateStatus::from_changed(changed)
         }
     }
-    dst.push_str(&src[pos..]);
-    UpdateStatus::from_changed(changed)
 }
 
 #[expect(clippy::must_use_candidate)]