refactor(toml): Let schema abstract over duplicate fields

Author: epage

src/cargo/util/toml/mod.rs

@@ -2333,17 +2333,6 @@ impl schema::TomlTarget {
         }
     }
 
-    fn proc_macro(&self) -> Option<bool> {
-        self.proc_macro_raw.or(self.proc_macro_raw2).or_else(|| {
-            if let Some(types) = self.crate_types() {
-                if types.contains(&"proc-macro".to_string()) {
-                    return Some(true);
-                }
-            }
-            None
-        })
-    }
-
     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(
@@ -2354,12 +2343,6 @@ impl schema::TomlTarget {
             );
         }
     }
-
-    fn crate_types(&self) -> Option<&Vec<String>> {
-        self.crate_type
-            .as_ref()
-            .or_else(|| self.crate_type2.as_ref())
-    }
 }
 
 impl schema::MaybeWorkspaceLints {

src/cargo/util/toml/schema.rs

@@ -939,6 +939,23 @@ impl TomlTarget {
     pub fn new() -> TomlTarget {
         TomlTarget::default()
     }
+
+    pub fn proc_macro(&self) -> Option<bool> {
+        self.proc_macro_raw.or(self.proc_macro_raw2).or_else(|| {
+            if let Some(types) = self.crate_types() {
+                if types.contains(&"proc-macro".to_string()) {
+                    return Some(true);
+                }
+            }
+            None
+        })
+    }
+
+    pub fn crate_types(&self) -> Option<&Vec<String>> {
+        self.crate_type
+            .as_ref()
+            .or_else(|| self.crate_type2.as_ref())
+    }
 }
 
 /// Corresponds to a `target` entry, but `TomlTarget` is already used.