diff options
author | Melody Horn <melody@boringcactus.com> | 2022-04-24 00:33:26 -0600 |
---|---|---|
committer | Melody Horn <melody@boringcactus.com> | 2022-04-24 00:33:26 -0600 |
commit | 18bd24960b220a0467aee57b1f77952a694433f0 (patch) | |
tree | 28cd22f8ebacc0bb4ed5d8e41d5252774ab62b50 /src | |
parent | 74b64c103302b3715ad4222782cf872405ac5463 (diff) | |
download | kdl-schema-canon.tar.gz kdl-schema-canon.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/lib.rs | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -107,9 +107,7 @@ impl Schema { /// # Errors /// /// returns an error if knuffel can't parse the document as a Schema - pub fn parse( - schema_kdl: &str, - ) -> Result<Self, knuffel::Error<impl knuffel::traits::ErrorSpan>> { + pub fn parse(schema_kdl: &str) -> Result<Self, knuffel::Error> { knuffel::parse("<Schema::parse argument>", schema_kdl) } } @@ -240,7 +238,7 @@ pub struct Node { pub description: Option<String>, /// KDL query from which to load node information instead of specifying it inline (allows for recursion) #[cfg_attr(feature = "parse-knuffel", knuffel(property))] - pub ref_: Option<String>, + pub r#ref: Option<String>, /// minimum number of occurrences of this node #[cfg_attr(feature = "parse-knuffel", knuffel(child, unwrap(argument)))] pub min: Option<usize>, @@ -301,7 +299,7 @@ impl Node { impl BuildFromRef for Node { fn ref_to(query: impl Into<String>) -> Self { Self { - ref_: Some(query.into()), + r#ref: Some(query.into()), ..Self::default() } } @@ -322,7 +320,7 @@ pub struct Prop { pub description: Option<String>, /// KDL query from which to load property information instead of specifying it inline (allows for recursion) #[cfg_attr(feature = "parse-knuffel", knuffel(property))] - pub ref_: Option<String>, + pub r#ref: Option<String>, /// whether or not this property is required #[cfg_attr(feature = "parse-knuffel", knuffel(child))] pub required: bool, @@ -344,7 +342,7 @@ impl Prop { impl BuildFromRef for Prop { fn ref_to(query: impl Into<String>) -> Self { Self { - ref_: Some(query.into()), + r#ref: Some(query.into()), ..Self::default() } } @@ -362,7 +360,7 @@ pub struct Value { pub description: Option<String>, /// KDL query from which to load value information instead of specifying it inline (allows for recursion) #[cfg_attr(feature = "parse-knuffel", knuffel(property))] - pub ref_: Option<String>, + pub r#ref: Option<String>, /// minimum number of occurrences of this value #[cfg_attr(feature = "parse-knuffel", knuffel(child, unwrap(argument)))] pub min: Option<usize>, @@ -387,7 +385,7 @@ impl Value { impl BuildFromRef for Value { fn ref_to(query: impl Into<String>) -> Self { Self { - ref_: Some(query.into()), + r#ref: Some(query.into()), ..Self::default() } } @@ -405,7 +403,7 @@ pub struct Children { pub description: Option<String>, /// KDL query from which to load children information instead of specifying it inline (allows for recursion) #[cfg_attr(feature = "parse-knuffel", knuffel(property))] - pub ref_: Option<String>, + pub r#ref: Option<String>, /// nodes which can appear as children #[cfg_attr(feature = "parse-knuffel", knuffel(children(name = "node")))] pub nodes: Vec<Node>, @@ -438,7 +436,7 @@ impl Children { impl BuildFromRef for Children { fn ref_to(query: impl Into<String>) -> Self { Self { - ref_: Some(query.into()), + r#ref: Some(query.into()), ..Self::default() } } |