clippy_dev: Use the shared parsing logic in new_lint.

Author: Jarcho

clippy_dev/Cargo.toml

@@ -9,7 +9,6 @@ annotate-snippets = { version = "0.12.10", features = ["simd"] }
 anstream = "0.6.20"
 chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
 clap = { version = "4.4", features = ["derive"] }
-indoc = "1.0"
 itertools = "0.12"
 memchr = "2.7.6"
 opener = "0.8"

clippy_dev/src/edit_lints.rs

@@ -180,7 +180,7 @@ fn remove_lint_declaration(
     let delete_mod = if data.lints.iter().all(|(_, l)| l.name_sp.file != lint_file) {
         delete_file_if_exists(lint_file.path.get())
     } else {
-        updater.update_file(lint_file.path.get(), &mut |_, src, dst| -> UpdateStatus {
+        updater.change_file(lint_file.path.get(), |src, dst| {
             let mut start = &src[..lint_data.decl_range.start as usize];
             if start.ends_with("\n\n") {
                 start = &start[..start.len() - 1];
@@ -191,7 +191,6 @@ fn remove_lint_declaration(
             }
             dst.push_str(start);
             dst.push_str(end);
-            UpdateStatus::Changed
         });
         false
     };

clippy_dev/src/fmt.rs

@@ -113,6 +113,7 @@ pub fn run(update_mode: UpdateMode) {
         cx.dcx.exit_on_err();
 
         let mut updater = FileUpdater::default();
+        let copy: &mut dyn FnMut(&str, &mut String) = &mut |src, dst| dst.push_str(src);
 
         #[expect(clippy::mutable_key_type)]
         let mut lints = lint_data.lints.mk_by_file_map();
@@ -122,13 +123,13 @@ pub fn run(update_mode: UpdateMode) {
             let mut lints = lints.remove(file);
             let lints = lints.as_deref_mut().unwrap_or_default();
             updater.update_loaded_file_checked("cargo dev fmt", update_mode, file, &mut |_, src, dst| {
-                gen_sorted_lints_file(src, dst, lints, passes, &mut ranges);
+                gen_sorted_lints_file(src, dst, lints, passes, &mut ranges, copy);
                 UpdateStatus::from_changed(src != dst)
             });
         }
         for (&file, lints) in &mut lints {
             updater.update_loaded_file_checked("cargo dev fmt", update_mode, file, &mut |_, src, dst| {
-                gen_sorted_lints_file(src, dst, lints, &mut [], &mut ranges);
+                gen_sorted_lints_file(src, dst, lints, &mut [], &mut ranges, copy);
                 UpdateStatus::from_changed(src != dst)
             });
         }
@@ -138,9 +139,7 @@ pub fn run(update_mode: UpdateMode) {
             update_mode,
             conf_data.decl_sp.file,
             &mut |_, src, dst| {
-                dst.push_str(&src[..conf_data.decl_sp.range.start as usize]);
-                conf_data.gen_mac(src, dst);
-                dst.push_str(&src[conf_data.decl_sp.range.end as usize..]);
+                conf_data.gen_file(src, dst);
                 UpdateStatus::from_changed(src != dst)
             },
         );

clippy_dev/src/generate.rs

@@ -238,6 +238,12 @@ impl LintPass<'_> {
 }
 
 impl ConfDef<'_> {
+    pub fn gen_file(&mut self, src: &str, dst: &mut String) {
+        dst.push_str(&src[..self.decl_sp.range.start as usize]);
+        self.gen_mac(src, dst);
+        dst.push_str(&src[self.decl_sp.range.end as usize..]);
+    }
+
     pub fn gen_mac(&mut self, src: &str, dst: &mut String) {
         self.opts.sort_unstable_by_key(|o| o.name);
         dst.push_str("define_Conf! {");
@@ -310,6 +316,7 @@ pub fn gen_sorted_lints_file(
     lints: &mut [ActiveLint<'_, '_>],
     passes: &mut [LintPass<'_>],
     ranges: &mut VecBuf<Range<u32>>,
+    copy_src: &mut dyn FnMut(&str, &mut String),
 ) {
     ranges.with(|ranges| {
         ranges.extend(lints.iter().map(|x| x.data.decl_range));
@@ -321,7 +328,7 @@ pub fn gen_sorted_lints_file(
 
         let mut ranges = ranges.iter();
         let pos = if let Some(range) = ranges.next() {
-            dst.push_str(&src[..range.start as usize]);
+            copy_src(&src[..range.start as usize], dst);
             for lint in &*lints {
                 lint.gen_mac(dst);
                 dst.push_str("\n\n");
@@ -333,29 +340,31 @@ pub fn gen_sorted_lints_file(
             }
             range.end
         } else {
-            dst.push_str(src);
+            copy_src(src, dst);
             return;
         };
 
         let pos = ranges.fold(pos, |start, range| {
             let s = &src[start as usize..range.start as usize];
-            dst.push_str(if s.trim_start().is_empty() {
-                // Only whitespace between this and the previous item. No need to keep that.
-                ""
-            } else if src[..pos as usize].ends_with("\n\n")
-                && let Some(s) = s.strip_prefix("\n\n")
-            {
-                // Empty line before and after. Remove one of them.
-                s
-            } else {
-                // Remove only full lines unless something is in the way.
-                s.strip_prefix('\n').unwrap_or(s)
-            });
+            // Don't keep whitespace between declarations.
+            if !s.trim_start().is_empty() {
+                let s = if src[..pos as usize].ends_with("\n\n")
+                    && let Some(s) = s.strip_prefix("\n\n")
+                {
+                    // Empty line before and after. Remove one of them.
+                    s
+                } else {
+                    // Remove the line end immediately proceeding a declaration.
+                    s.strip_prefix('\n').unwrap_or(s)
+                };
+                copy_src(s, dst);
+            }
             range.end
         });
 
         // Since we always generate an empty line at the end, make sure to always skip it.
         let s = &src[pos as usize..];
-        dst.push_str(s.strip_prefix('\n').map_or(s, |s| s.strip_prefix('\n').unwrap_or(s)));
+        let s = s.strip_prefix('\n').map_or(s, |s| s.strip_prefix('\n').unwrap_or(s));
+        copy_src(s, dst);
     });
 }

clippy_dev/src/main.rs

@@ -35,16 +35,8 @@ fn main() {
             pass,
             name,
             category,
-            r#type,
             msrv,
-        } => {
-            new_lint::create(clippy.version, pass, &name, &category, r#type.as_deref(), msrv);
-            new_parse_cx(|cx| {
-                let data = cx.parse_lint_decls();
-                cx.dcx.exit_on_err();
-                data.gen_decls(UpdateMode::Change);
-            });
-        },
+        } => new_lint::create(clippy.version, &pass, &name, &category, msrv),
         DevCommand::Setup(SetupCommand { subcommand }) => match subcommand {
             SetupSubcommand::Intellij { remove, repo_path } => {
                 if remove {
@@ -162,9 +154,9 @@ enum DevCommand {
     #[command(name = "new_lint")]
     /// Create a new lint and run `cargo dev update_lints`
     NewLint {
-        #[arg(short, long, conflicts_with = "type", default_value = "late")]
+        #[arg(short, long, default_value = "late")]
         /// Specify whether the lint runs during the early or late pass
-        pass: new_lint::Pass,
+        pass: String,
         #[arg(
             short,
             long,
@@ -191,9 +183,6 @@ enum DevCommand {
         /// What category the lint belongs to
         category: String,
         #[arg(long)]
-        /// What directory the lint belongs in
-        r#type: Option<String>,
-        #[arg(long)]
         /// Add MSRV config code to the lint
         msrv: bool,
     },