itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(toml): Move accessor to be part of schema API

Browse Source
This commit is contained in:
Ed Page 2023-11-18 21:48:35 -06:00
parent 512ce788c5
commit 7e4d0a6149
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cargo/util/toml/mod.rs
View File

@ -1568,13 +1568,6 @@ impl<T> schema::InheritableField<T> {
}), }),
} }
} }
fn as_value(&self) -> Option<&T> {
match self {
schema::InheritableField::Inherit(_) => None,
schema::InheritableField::Value(defined) => Some(defined),
}
}
} }
impl schema::InheritableDependency { impl schema::InheritableDependency {

9
src/cargo/util/toml/schema.rs
View File

@ -170,6 +170,15 @@ pub enum InheritableField<T> {
Inherit(TomlInheritedField), Inherit(TomlInheritedField),
} }
impl<T> InheritableField<T> {
pub fn as_value(&self) -> Option<&T> {
match self {
InheritableField::Inherit(_) => None,
InheritableField::Value(defined) => Some(defined),
}
}
}
//. This already has a `Deserialize` impl from version_trim_whitespace //. This already has a `Deserialize` impl from version_trim_whitespace
pub type InheritableSemverVersion = InheritableField<semver::Version>; pub type InheritableSemverVersion = InheritableField<semver::Version>;
impl<'de> de::Deserialize<'de> for InheritableSemverVersion { impl<'de> de::Deserialize<'de> for InheritableSemverVersion {