From af38b09d5a9c6273dea5e2a396a97cdce8d0afe1 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Mon, 26 Jul 2021 20:41:36 +0200 Subject: [PATCH] Fix all tests --- crates/eww_shared_util/src/span.rs | 8 ++++++-- .../src/config/snapshots/yuck__config__test__config.snap | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/crates/eww_shared_util/src/span.rs b/crates/eww_shared_util/src/span.rs index 6cbd0f7..94919b1 100644 --- a/crates/eww_shared_util/src/span.rs +++ b/crates/eww_shared_util/src/span.rs @@ -45,13 +45,17 @@ impl Span { impl std::fmt::Display for Span { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}..{}", self.0, self.1) + if self.is_dummy() { + write!(f, "DUMMY") + } else { + write!(f, "{}..{}", self.0, self.1) + } } } impl std::fmt::Debug for Span { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}..{}", self.0, self.1) + write!(f, "{}", self) } } diff --git a/crates/yuck/src/config/snapshots/yuck__config__test__config.snap b/crates/yuck/src/config/snapshots/yuck__config__test__config.snap index d633ab4..ce4f786 100644 --- a/crates/yuck/src/config/snapshots/yuck__config__test__config.snap +++ b/crates/yuck/src/config/snapshots/yuck__config__test__config.snap @@ -18,7 +18,7 @@ Config( attrs: { AttrName("arg"): AttrEntry( key_span: Span(52, 56, 0), - value: Literal(Span(57, 61, 0), DynVal("hi", None)), + value: Literal(Span(57, 61, 0), DynVal("hi", Span(18446744073709551615, 18446744073709551615, 18446744073709551615))), ), }, ), @@ -56,7 +56,7 @@ Config( attrs: { AttrName("arg"): AttrEntry( key_span: Span(468, 472, 0), - value: Literal(Span(473, 478, 0), DynVal("bla", None)), + value: Literal(Span(473, 478, 0), DynVal("bla", Span(18446744073709551615, 18446744073709551615, 18446744073709551615))), ), }, ), @@ -79,7 +79,7 @@ Config( var_definitions: { VarName("some_var"): VarDefinition( name: VarName("some_var"), - initial_value: DynVal("bla", None), + initial_value: DynVal("bla", Span(18446744073709551615, 18446744073709551615, 18446744073709551615)), span: Span(72, 95, 0), ), },