From 4c405366ed49a38ccc40ccdacd4ef4a4810e0bab Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 29 May 2024 14:02:10 -0500 Subject: [PATCH 1/2] fix(filter): Don't stop redactin on first mismatch --- crates/snapbox/src/filter/pattern.rs | 5 +++-- crates/snapbox/src/filter/test_redactions.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/snapbox/src/filter/pattern.rs b/crates/snapbox/src/filter/pattern.rs index 4c854e32..54aae274 100644 --- a/crates/snapbox/src/filter/pattern.rs +++ b/crates/snapbox/src/filter/pattern.rs @@ -523,8 +523,9 @@ fn normalize_str_to_redactions(input: &str, pattern: &str, redactions: &Redactio input_index += 1; normalized.push(pattern_line); } else { - // Give up doing further normalization - break; + // Skip this line and keep processing + input_index += 1; + normalized.push(input_line); } } } diff --git a/crates/snapbox/src/filter/test_redactions.rs b/crates/snapbox/src/filter/test_redactions.rs index 2f75beca..c26d9ab9 100644 --- a/crates/snapbox/src/filter/test_redactions.rs +++ b/crates/snapbox/src/filter/test_redactions.rs @@ -131,7 +131,7 @@ fn str_normalize_post_elide_diverge() { fn str_normalize_post_diverge_elide() { let input = "Hello\nWorld\nGoodbye\nSir"; let pattern = "Hello\nMoon\nGoodbye\n..."; - let expected = "Hello\nWorld\nGoodbye\nSir"; + let expected = "Hello\nWorld\nGoodbye\n..."; let actual = NormalizeToExpected::new() .redact() .normalize(input.into(), &pattern.into()); From 7fe225de2b6c565caf66ec034fe56a370ddf190d Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 29 May 2024 14:02:36 -0500 Subject: [PATCH 2/2] style: Make lints happy --- crates/snapbox/src/assert/error.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/snapbox/src/assert/error.rs b/crates/snapbox/src/assert/error.rs index b8b6e186..11b0a4ad 100644 --- a/crates/snapbox/src/assert/error.rs +++ b/crates/snapbox/src/assert/error.rs @@ -96,7 +96,7 @@ impl Backtrace { #[cfg(not(feature = "debug"))] impl std::fmt::Display for Backtrace { - fn fmt(&self, _: &mut std::fmt::Formatter) -> std::fmt::Result { + fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { Ok(()) } }