More fixes

Author: Jarcho

clippy_dev/src/update_lints.rs

@@ -245,11 +245,13 @@ pub fn rename(old_name: &str, new_name: &str, uplift: bool) {
             new_name
         );
     } else {
-        // Rename the lint struct and the containing module if it shares the lint name across all files.
+        // Rename the lint struct and source files sharing a name with the lint.
         let lint = &mut lints[old_lint_index];
         let old_name_upper = old_name.to_uppercase();
         let new_name_upper = new_name.to_uppercase();
+        lint.name = new_name.into();
 
+        // Rename test files. only rename `.stderr` and `.fixed` files if the new test name doesn't exist.
         if try_rename_file(
             Path::new(&format!("tests/ui/{}.rs", old_name)),
             Path::new(&format!("tests/ui/{}.rs", new_name)),
@@ -264,30 +266,41 @@ pub fn rename(old_name: &str, new_name: &str, uplift: bool) {
             );
         }
 
+        // Try to rename the file containing the lint if the file name matches the lint's name.
         let replacements;
-        let replacements = if lint.module == lint.name
+        let replacements = if lint.module == old_name
             && try_rename_file(
                 Path::new(&format!("clippy_lints/src/{}.rs", old_name)),
                 Path::new(&format!("clippy_lints/src/{}.rs", new_name)),
             ) {
-            lint.module = new_name.into();
+            // Edit the module name in the lint list. Note there could be multiple lints.
+            for lint in lints.iter_mut().filter(|l| l.module == old_name) {
+                lint.module = new_name.into();
+            }
             replacements = [(&*old_name_upper, &*new_name_upper), (old_name, new_name)];
             replacements.as_slice()
         } else if !lint.module.contains("::")
+            // Catch cases like `methods/lint_name.rs` where the lint is stored in `methods/mod.rs`
             && try_rename_file(
                 Path::new(&format!("clippy_lints/src/{}/{}.rs", lint.module, old_name)),
                 Path::new(&format!("clippy_lints/src/{}/{}.rs", lint.module, new_name)),
             )
         {
+            // Edit the module name in the lint list. Note there could be multiple lints, or none.
+            let renamed_mod = format!("{}::{}", lint.module, old_name);
+            for lint in lints.iter_mut().filter(|l| l.module == renamed_mod) {
+                lint.module = format!("{}::{}", lint.module, new_name);
+            }
             replacements = [(&*old_name_upper, &*new_name_upper), (old_name, new_name)];
             replacements.as_slice()
         } else {
             replacements = [(&*old_name_upper, &*new_name_upper), ("", "")];
             &replacements[0..1]
         };
-        lint.name = new_name.into();
 
-        for (_, file) in clippy_lints_src_files() {
+        // Don't change `clippy_utils/src/renamed_lints.rs` here as it would try to edit the lint being
+        // renamed.
+        for (_, file) in clippy_lints_src_files().filter(|(rel_path, _)| rel_path != OsStr::new("renamed_lints.rs")) {
             rewrite_file(file.path(), |s| replace_ident_like(s, replacements));
         }