From c7f60b4c56b5ece4f608d90014664a992b8677e2 Mon Sep 17 00:00:00 2001 From: YOSHIOKA Takuma Date: Fri, 21 Feb 2025 20:45:31 +0900 Subject: [PATCH] Access `span` fields only when `span` feature is enabled --- src/entry.rs | 5 ++++- src/v2_parser.rs | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/entry.rs b/src/entry.rs index 1cd56ee..986be5a 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -580,7 +580,10 @@ mod test { let entry: KdlEntry = " \\\n (\"m\\\"eh\")0xDEADbeef\t\\\n".parse()?; let mut ty: KdlIdentifier = "\"m\\\"eh\"".parse()?; - ty.span = (5..12).into(); + #[cfg(feature = "span")] + { + ty.span = (5..12).into(); + } assert_eq!( entry, KdlEntry { diff --git a/src/v2_parser.rs b/src/v2_parser.rs index 2296b85..a7ab43b 100644 --- a/src/v2_parser.rs +++ b/src/v2_parser.rs @@ -439,11 +439,13 @@ fn test_node() { name: KdlIdentifier { value: "foo".into(), repr: Some("foo".into()), + #[cfg(feature = "span")] span: (0..3).into() }, entries: vec![], children: None, format: Some(Default::default()), + #[cfg(feature = "span")] span: (0..7).into() } ); @@ -455,6 +457,7 @@ fn test_node() { name: KdlIdentifier { value: "foo".into(), repr: Some("foo".into()), + #[cfg(feature = "span")] span: (0..3).into() }, entries: vec![KdlEntry { @@ -466,12 +469,14 @@ fn test_node() { leading: " ".into(), ..Default::default() }), + #[cfg(feature = "span")] span: SourceSpan::new(3.into(), 4) }], children: None, format: Some(KdlNodeFormat { ..Default::default() }), + #[cfg(feature = "span")] span: (0..8).into() } ); @@ -552,7 +557,6 @@ fn node_entry(input: &mut Input<'_>) -> PResult> { fmt.after_key = after_key.into(); fmt.after_eq = after_eq.into(); } - #[cfg(feature = "span")] value }) } else if let Some(ident) = maybe_ident { @@ -607,6 +611,7 @@ fn entry_test() { value_repr: "bar".into(), ..Default::default() }), + #[cfg(feature = "span")] span: (0..7).into() }) ); @@ -621,6 +626,7 @@ fn entry_test() { value_repr: "foo".into(), ..Default::default() }), + #[cfg(feature = "span")] span: (0..3).into() }) ); @@ -636,6 +642,7 @@ fn entry_test() { leading: "/-foo ".into(), ..Default::default() }), + #[cfg(feature = "span")] span: (6..9).into() }) ); @@ -648,6 +655,7 @@ fn entry_test() { name: Some(KdlIdentifier { value: "bar".into(), repr: Some("bar".into()), + #[cfg(feature = "span")] span: (9..12).into(), }), format: Some(KdlEntryFormat { @@ -657,6 +665,7 @@ fn entry_test() { after_eq: " ".into(), ..Default::default() }), + #[cfg(feature = "span")] span: (9..16).into() }) ); @@ -669,6 +678,7 @@ fn entry_test() { name: Some(KdlIdentifier { value: "bar".into(), repr: Some("bar".into()), + #[cfg(feature = "span")] span: (12..16).into(), }), format: Some(KdlEntryFormat { @@ -678,6 +688,7 @@ fn entry_test() { after_eq: " ".into(), ..Default::default() }), + #[cfg(feature = "span")] span: (12..18).into() }) ); @@ -1508,6 +1519,7 @@ mod string_tests { KdlIdentifier { value: "foo".into(), repr: Some("foo".into()), + #[cfg(feature = "span")] span: (0..3).into() } ); @@ -1516,6 +1528,7 @@ mod string_tests { KdlIdentifier { value: "+.".into(), repr: Some("+.".into()), + #[cfg(feature = "span")] span: (0..1).into() } )