.

Author: SimonCropp

src/Verify/Serialization/Scrubbers/DateScrubber.cs

@@ -208,7 +208,7 @@ static void ReplaceInner(StringBuilder builder, string format, Counter counter,
 
         var context = new MatchContext(format, counter, culture, tryConvert, max, min);
 
-        CrossChunkMatcher.ReplaceAll<MatchContext>(
+        CrossChunkMatcher.ReplaceAll(
             builder,
             carryoverSize: max - 1,
             context,

src/Verify/Serialization/Scrubbers/DirectoryReplacements_StringBuilder.cs

@@ -41,7 +41,7 @@ public static void Replace(StringBuilder builder, List<Pair> paths)
         var maxLength = paths[0].Find.Length;
         var context = new MatchContext(paths);
 
-        CrossChunkMatcher.ReplaceAll<MatchContext>(
+        CrossChunkMatcher.ReplaceAll(
             builder,
             carryoverSize: maxLength - 1,
             context,

src/Verify/Serialization/Scrubbers/GuidScrubber.cs

@@ -13,12 +13,10 @@ public static void ReplaceGuids(StringBuilder builder, Counter counter)
             return;
         }
 
-        var context = new MatchContext(counter);
-
-        CrossChunkMatcher.ReplaceAll<MatchContext>(
+        CrossChunkMatcher.ReplaceAll(
             builder,
             carryoverSize: 35,
-            context,
+            counter,
             OnCrossChunk,
             OnWithinChunk);
     }
@@ -30,7 +28,7 @@ static void OnCrossChunk(
         int remainingInCarryover,
         CharSpan currentChunkSpan,
         int absoluteStartPosition,
-        MatchContext context,
+        Counter counter,
         Action<Match> addMatch)
     {
         var neededFromCurrent = 36 - remainingInCarryover;
@@ -65,7 +63,7 @@ static void OnCrossChunk(
             return;
         }
 
-        var convert = context.Counter.Convert(guid);
+        var convert = counter.Convert(guid);
         addMatch(new(absoluteStartPosition, 36, convert));
     }
 
@@ -74,7 +72,7 @@ static int OnWithinChunk(
         CharSpan chunkSpan,
         int chunkIndex,
         int absoluteIndex,
-        MatchContext context,
+        Counter counter,
         Action<Match> addMatch)
     {
         var end = chunkIndex + 36;
@@ -101,7 +99,7 @@ static int OnWithinChunk(
             return 1;
         }
 
-        var convert = context.Counter.Convert(guid);
+        var convert = counter.Convert(guid);
         addMatch(new(absoluteIndex, 36, convert));
         return 36; // Skip past the matched GUID
     }
@@ -119,9 +117,4 @@ static bool IsInvalidStartingChar(char ch) =>
         IsInvalidChar(ch) &&
         ch != '{' &&
         ch != '(';
-
-    sealed class MatchContext(Counter counter)
-    {
-        public Counter Counter { get; } = counter;
-    }
 }