refactor(toml): Hard-code InheritableField for package table

Author: epage

src/cargo/util/toml/mod.rs

@@ -1539,30 +1539,17 @@ impl schema::TomlPackage {
     }
 }
 
-/// This Trait exists to make [`schema::InheritableField::Inherit`] generic. It makes deserialization of
-/// [`schema::InheritableField`] much easier, as well as making error messages for
-/// [`schema::InheritableField::resolve`] much nicer
-///
-/// Implementors should have a field `workspace` with the type of `bool`. It is used to ensure
-/// `workspace` is not `false` in a `Cargo.toml`
-pub trait WorkspaceInherit {
-    /// This is the workspace table that is being inherited from.
-    /// For example `[workspace.dependencies]` would be the table "dependencies"
-    fn inherit_toml_table(&self) -> &str;
-}
-
-impl<T, W: WorkspaceInherit> schema::InheritableField<T, W> {
+impl<T> schema::InheritableField<T> {
     fn resolve<'a>(
         self,
         label: &str,
         get_ws_inheritable: impl FnOnce() -> CargoResult<T>,
     ) -> CargoResult<T> {
         match self {
             schema::InheritableField::Value(value) => Ok(value),
-            schema::InheritableField::Inherit(w) => get_ws_inheritable().with_context(|| {
+            schema::InheritableField::Inherit(_) => get_ws_inheritable().with_context(|| {
                 format!(
-                "error inheriting `{label}` from workspace root manifest's `workspace.{}.{label}`",
-                w.inherit_toml_table(),
+                "error inheriting `{label}` from workspace root manifest's `workspace.package.{label}`",
             )
             }),
         }
@@ -1576,12 +1563,6 @@ impl<T, W: WorkspaceInherit> schema::InheritableField<T, W> {
     }
 }
 
-impl WorkspaceInherit for schema::TomlInheritedField {
-    fn inherit_toml_table(&self) -> &str {
-        "package"
-    }
-}
-
 impl schema::InheritableDependency {
     fn resolve_with_self<'a>(
         self,

src/cargo/util/toml/schema.rs

@@ -174,15 +174,15 @@ pub struct TomlPackage {
 /// An enum that allows for inheriting keys from a workspace in a Cargo.toml.
 #[derive(Serialize, Copy, Clone, Debug)]
 #[serde(untagged)]
-pub enum InheritableField<T, W> {
+pub enum InheritableField<T> {
     /// The type that that is used when not inheriting from a workspace.
     Value(T),
     /// The type when inheriting from a workspace.
-    Inherit(W),
+    Inherit(TomlInheritedField),
 }
 
 //. This already has a `Deserialize` impl from version_trim_whitespace
-pub type InheritableSemverVersion = InheritableField<semver::Version, TomlInheritedField>;
+pub type InheritableSemverVersion = InheritableField<semver::Version>;
 impl<'de> de::Deserialize<'de> for InheritableSemverVersion {
     fn deserialize<D>(d: D) -> Result<Self, D::Error>
     where
@@ -201,7 +201,7 @@ impl<'de> de::Deserialize<'de> for InheritableSemverVersion {
     }
 }
 
-pub type InheritableString = InheritableField<String, TomlInheritedField>;
+pub type InheritableString = InheritableField<String>;
 impl<'de> de::Deserialize<'de> for InheritableString {
     fn deserialize<D>(d: D) -> Result<Self, D::Error>
     where
@@ -236,7 +236,7 @@ impl<'de> de::Deserialize<'de> for InheritableString {
     }
 }
 
-pub type InheritableRustVersion = InheritableField<RustVersion, TomlInheritedField>;
+pub type InheritableRustVersion = InheritableField<RustVersion>;
 impl<'de> de::Deserialize<'de> for InheritableRustVersion {
     fn deserialize<D>(d: D) -> Result<Self, D::Error>
     where
@@ -272,7 +272,7 @@ impl<'de> de::Deserialize<'de> for InheritableRustVersion {
     }
 }
 
-pub type InheritableVecString = InheritableField<Vec<String>, TomlInheritedField>;
+pub type InheritableVecString = InheritableField<Vec<String>>;
 impl<'de> de::Deserialize<'de> for InheritableVecString {
     fn deserialize<D>(d: D) -> Result<Self, D::Error>
     where
@@ -307,7 +307,7 @@ impl<'de> de::Deserialize<'de> for InheritableVecString {
     }
 }
 
-pub type InheritableStringOrBool = InheritableField<StringOrBool, TomlInheritedField>;
+pub type InheritableStringOrBool = InheritableField<StringOrBool>;
 impl<'de> de::Deserialize<'de> for InheritableStringOrBool {
     fn deserialize<D>(d: D) -> Result<Self, D::Error>
     where
@@ -351,7 +351,7 @@ impl<'de> de::Deserialize<'de> for InheritableStringOrBool {
     }
 }
 
-pub type InheritableVecStringOrBool = InheritableField<VecStringOrBool, TomlInheritedField>;
+pub type InheritableVecStringOrBool = InheritableField<VecStringOrBool>;
 impl<'de> de::Deserialize<'de> for InheritableVecStringOrBool {
     fn deserialize<D>(d: D) -> Result<Self, D::Error>
     where
@@ -395,8 +395,7 @@ impl<'de> de::Deserialize<'de> for InheritableVecStringOrBool {
     }
 }
 
-pub type InheritableBtreeMap =
-    InheritableField<BTreeMap<String, BTreeMap<String, String>>, TomlInheritedField>;
+pub type InheritableBtreeMap = InheritableField<BTreeMap<String, BTreeMap<String, String>>>;
 
 impl<'de> de::Deserialize<'de> for InheritableBtreeMap {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>