refactor(toml): Move target duplicate-field logic next to use

Author: epage

src/cargo/util/toml/mod.rs

@@ -2286,28 +2286,6 @@ impl schema::TomlTarget {
             None => panic!("target name is required"),
         }
     }
-
-    fn validate_proc_macro(&self, warnings: &mut Vec<String>) {
-        if self.proc_macro_raw.is_some() && self.proc_macro_raw2.is_some() {
-            warn_on_deprecated(
-                "proc-macro",
-                self.name().as_str(),
-                "library target",
-                warnings,
-            );
-        }
-    }
-
-    fn validate_crate_types(&self, target_kind_human: &str, warnings: &mut Vec<String>) {
-        if self.crate_type.is_some() && self.crate_type2.is_some() {
-            warn_on_deprecated(
-                "crate-type",
-                self.name().as_str(),
-                format!("{target_kind_human} target").as_str(),
-                warnings,
-            );
-        }
-    }
 }
 
 impl schema::MaybeWorkspaceLints {

src/cargo/util/toml/targets.rs

@@ -23,6 +23,7 @@ use crate::core::compiler::CrateType;
 use crate::core::{Edition, Feature, Features, Target};
 use crate::util::errors::CargoResult;
 use crate::util::restricted_names;
+use crate::util::toml::warn_on_deprecated;
 
 use anyhow::Context as _;
 
@@ -172,8 +173,8 @@ fn clean_lib(
     };
 
     let Some(ref lib) = lib else { return Ok(None) };
-    lib.validate_proc_macro(warnings);
-    lib.validate_crate_types("library", warnings);
+    validate_proc_macro(lib, "library", warnings);
+    validate_crate_types(lib, "library", warnings);
 
     validate_target_name(lib, "library", "lib", warnings)?;
 
@@ -398,7 +399,7 @@ fn clean_examples(
 
     let mut result = Vec::new();
     for (path, toml) in targets {
-        toml.validate_crate_types("example", warnings);
+        validate_crate_types(&toml, "example", warnings);
         let crate_types = match toml.crate_types() {
             Some(kinds) => kinds.iter().map(|s| s.into()).collect(),
             None => Vec::new(),
@@ -984,3 +985,25 @@ fn maybe_custom_build(build: &Option<StringOrBool>, package_root: &Path) -> Opti
         }
     }
 }
+
+fn validate_proc_macro(target: &TomlTarget, kind: &str, warnings: &mut Vec<String>) {
+    if target.proc_macro_raw.is_some() && target.proc_macro_raw2.is_some() {
+        warn_on_deprecated(
+            "proc-macro",
+            target.name().as_str(),
+            format!("{kind} target").as_str(),
+            warnings,
+        );
+    }
+}
+
+fn validate_crate_types(target: &TomlTarget, kind: &str, warnings: &mut Vec<String>) {
+    if target.crate_type.is_some() && target.crate_type2.is_some() {
+        warn_on_deprecated(
+            "crate-type",
+            target.name().as_str(),
+            format!("{kind} target").as_str(),
+            warnings,
+        );
+    }
+}