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

rust-lang · Nov 19, 2023 · 7e4d0a6 · 7e4d0a6
1 parent 512ce78
commit 7e4d0a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs
@@ -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 {

diff --git a/src/cargo/util/toml/schema.rs b/src/cargo/util/toml/schema.rs
@@ -170,6 +170,15 @@ pub enum InheritableField<T> {
     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
 pub type InheritableSemverVersion = InheritableField<semver::Version>;
 impl<'de> de::Deserialize<'de> for InheritableSemverVersion {