diff --git a/src/entry.rs b/src/entry.rs index 677b386..e5869b6 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -179,12 +179,11 @@ impl Display for KdlEntry { write!(f, "{}", name)?; if let Some(KdlEntryFormat { after_key, - eq, after_eq, .. }) = &self.format { - write!(f, "{}{}{}", after_key, eq, after_eq)?; + write!(f, "{}={}", after_key, after_eq)?; } else { write!(f, "=")?; } @@ -271,8 +270,6 @@ pub struct KdlEntryFormat { pub after_key: String, /// Whitespace and comments between an entry's equals sign and its value. pub after_eq: String, - /// Actual text used as an entry's equals sign. - pub eq: String, } #[cfg(test)] @@ -346,7 +343,6 @@ mod test { name: Some("foo".parse()?), format: Some(KdlEntryFormat { value_repr: "bar".into(), - eq: "=".into(), ..Default::default() }), #[cfg(feature = "span")] @@ -387,7 +383,6 @@ mod test { after_ty: "".into(), after_key: "".into(), after_eq: "".into(), - eq: "=".into(), }), ty: Some("\"m\\\"eh\"".parse()?), value: KdlValue::Integer(0xdeadbeef), diff --git a/src/v2_parser.rs b/src/v2_parser.rs index 670a45d..8a8b2b5 100644 --- a/src/v2_parser.rs +++ b/src/v2_parser.rs @@ -420,7 +420,6 @@ fn entry_test() { name: Some("foo".parse().unwrap()), format: Some(KdlEntryFormat { value_repr: "bar".into(), - eq: "=".into(), ..Default::default() }), span: (0..7).into() @@ -466,7 +465,7 @@ fn node_terminator(input: &mut Input<'_>) -> PResult<()> { /// `prop := string optional-node-space equals-sign optional-node-space value` fn prop(input: &mut Input<'_>) -> PResult> { - let ((key, after_key, eq, after_eq, value), _span) = ( + let ((key, after_key, _eqa, after_eq, value), _span) = ( identifier, optional_node_space.take(), equals_sign.take(), @@ -479,7 +478,6 @@ fn prop(input: &mut Input<'_>) -> PResult> { value.name = Some(key); if let Some(fmt) = value.format_mut() { fmt.after_ty = after_key.into(); - fmt.eq = eq.into(); fmt.after_eq = after_eq.into(); } #[cfg(feature = "span")]