Slightly more cleanup and clarification

mnadareski · mnadareski · commit a334ffc25a74 · 2026-01-27T09:13:30.000-05:00
diff --git a/SabreTools.Hashing.Test/HashToolTests.cs b/SabreTools.Hashing.Test/HashToolTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using Xunit;
 
@@ -16,15 +15,15 @@ private static readonly string _hashFilePath
         /// <summary>
         /// Get an array of all hash types
         /// </summary>
-        public static List<object[]> AllHashTypes
+        public static TheoryData<HashType> AllHashTypes
         {
             get
             {
                 var values = Enum.GetValues<HashType>();
-                var set = new List<object[]>();
+                var set = new TheoryData<HashType>();
                 foreach (var value in values)
                 {
-                    set.Add([value]);
+                    set.Add(value);
                 }
 
                 return set;
diff --git a/SabreTools.Hashing.Test/ZeroHashTests.cs b/SabreTools.Hashing.Test/ZeroHashTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -10,15 +9,15 @@ public class ZeroHashTests
         /// <summary>
         /// Get an array of all hash types
         /// </summary>
-        public static List<object[]> AllHashTypes
+        public static TheoryData<HashType> AllHashTypes
         {
             get
             {
                 var values = Enum.GetValues<HashType>();
-                var set = new List<object[]>();
+                var set = new TheoryData<HashType>();
                 foreach (var value in values)
                 {
-                    set.Add([value]);
+                    set.Add(value);
                 }
 
                 return set;
diff --git a/SabreTools.Hashing/SpamSum/Comparisons.cs b/SabreTools.Hashing/SpamSum/Comparisons.cs
@@ -163,13 +163,15 @@ private static uint ScoreStrings(string first, string second, uint blockSize)
                 secondTraverse[secondIndex + 1] = Math.Min(Math.Min(costA, costD), costR);
             }
 
+#pragma warning disable IDE0180 // Use tuple to swap values
 #if NETCOREAPP || NETSTANDARD2_0_OR_GREATER
             (secondTraverse, firstTraverse) = (firstTraverse, secondTraverse);
 #else
             var tempArray = firstTraverse;
             firstTraverse = secondTraverse;
             secondTraverse = tempArray;
 #endif
+#pragma warning restore IDE0180
         }
 
         long score = firstTraverse[second.Length];
diff --git a/SabreTools.Hashing/SpamSum/SpamSum.cs b/SabreTools.Hashing/SpamSum/SpamSum.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using static SabreTools.Hashing.SpamSum.Constants;
 
+#pragma warning disable IDE0059 // Unnecessary assignment of a value
 namespace SabreTools.Hashing.SpamSum
 {
     /// <see href="https://github.com/ssdeep-project/ssdeep/blob/master/fuzzy.c"/>
diff --git a/SabreTools.Hashing/XxHash/Constants.cs b/SabreTools.Hashing/XxHash/Constants.cs
@@ -1,3 +1,4 @@
+#pragma warning disable IDE0051 // Remove unused private members
 namespace SabreTools.Hashing.XxHash
 {
     // https://github.com/Cyan4973/xxHash/blob/dev/xxhash.h
@@ -63,9 +64,7 @@ internal static class Constants
         /// </summary>
         public const int XXH_SECRET_CONSUME_RATE = 8;
 
-#pragma warning disable IDE0051
         private const int XXH_ACC_NB = XXH_STRIPE_LEN / sizeof(ulong);
-#pragma warning restore IDE0051
 
         #endregion
     }
diff --git a/SabreTools.Hashing/XxHash/XXH3_128State.cs b/SabreTools.Hashing/XxHash/XXH3_128State.cs
@@ -1,13 +1,12 @@
+#pragma warning disable CS0169 // Private field is never used
+#pragma warning disable CS0414 // Private field is assigned but its value is never used
+#pragma warning disable CS0649 // Field is never assigned to
+#pragma warning disable IDE0044 // Add readonly modifier
+#pragma warning disable IDE0051 // Remove unused private members
+#pragma warning disable IDE0052 // Remove unread private members
+#pragma warning disable IDE0060 // Remove unused parameter
 namespace SabreTools.Hashing.XxHash
 {
-    // Handle unused private fields
-#pragma warning disable CS0169
-#pragma warning disable CS0414
-#pragma warning disable CS0649
-#pragma warning disable IDE0044
-#pragma warning disable IDE0051
-#pragma warning disable IDE0052
-
     /// <summary>
     /// Structure for XXH3 streaming API.
     /// </summary>
diff --git a/SabreTools.Hashing/XxHash/XXH3_64State.cs b/SabreTools.Hashing/XxHash/XXH3_64State.cs
@@ -1,13 +1,12 @@
+#pragma warning disable CS0169 // Private field is never used
+#pragma warning disable CS0414 // Private field is assigned but its value is never used
+#pragma warning disable CS0649 // Field is never assigned to
+#pragma warning disable IDE0044 // Add readonly modifier
+#pragma warning disable IDE0051 // Remove unused private members
+#pragma warning disable IDE0052 // Remove unread private members
+#pragma warning disable IDE0060 // Remove unused parameter
 namespace SabreTools.Hashing.XxHash
 {
-    // Handle unused private fields
-#pragma warning disable CS0169
-#pragma warning disable CS0414
-#pragma warning disable CS0649
-#pragma warning disable IDE0044
-#pragma warning disable IDE0051
-#pragma warning disable IDE0052
-
     /// <summary>
     /// Structure for XXH3 streaming API.
     /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using System.IO;`
`4`	`3`	`using Xunit;`
`5`	`4`
`@@ -16,15 +15,15 @@ private static readonly string _hashFilePath`
`16`	`15`	`/// <summary>`
`17`	`16`	`/// Get an array of all hash types`
`18`	`17`	`/// </summary>`
`19`		`- public static List<object[]> AllHashTypes`
	`18`	`+ public static TheoryData<HashType> AllHashTypes`
`20`	`19`	`{`
`21`	`20`	`get`
`22`	`21`	`{`
`23`	`22`	`var values = Enum.GetValues<HashType>();`
`24`		`- var set = new List<object[]>();`
	`23`	`+ var set = new TheoryData<HashType>();`
`25`	`24`	`foreach (var value in values)`
`26`	`25`	`{`
`27`		`- set.Add([value]);`
	`26`	`+ set.Add(value);`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`return set;`
Original file line number	Diff line number	Diff line change
`@@ -163,13 +163,15 @@ private static uint ScoreStrings(string first, string second, uint blockSize)`
`163`	`163`	`secondTraverse[secondIndex + 1] = Math.Min(Math.Min(costA, costD), costR);`
`164`	`164`	`}`
`165`	`165`
	`166`	`+#pragma warning disable IDE0180 // Use tuple to swap values`
`166`	`167`	`#if NETCOREAPP \|\| NETSTANDARD2_0_OR_GREATER`
`167`	`168`	`(secondTraverse, firstTraverse) = (firstTraverse, secondTraverse);`
`168`	`169`	`#else`
`169`	`170`	`var tempArray = firstTraverse;`
`170`	`171`	`firstTraverse = secondTraverse;`
`171`	`172`	`secondTraverse = tempArray;`
`172`	`173`	`#endif`
	`174`	`+#pragma warning restore IDE0180`
`173`	`175`	`}`
`174`	`176`
`175`	`177`	`long score = firstTraverse[second.Length];`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Text;`
`3`	`3`	`using static SabreTools.Hashing.SpamSum.Constants;`
`4`	`4`
	`5`	`+#pragma warning disable IDE0059 // Unnecessary assignment of a value`
`5`	`6`	`namespace SabreTools.Hashing.SpamSum`
`6`	`7`	`{`
`7`	`8`	`/// <see href="https://github.com/ssdeep-project/ssdeep/blob/master/fuzzy.c"/>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#pragma warning disable IDE0051 // Remove unused private members`
`1`	`2`	`namespace SabreTools.Hashing.XxHash`
`2`	`3`	`{`
`3`	`4`	`// https://github.com/Cyan4973/xxHash/blob/dev/xxhash.h`
`@@ -63,9 +64,7 @@ internal static class Constants`
`63`	`64`	`/// </summary>`
`64`	`65`	`public const int XXH_SECRET_CONSUME_RATE = 8;`
`65`	`66`
`66`		`-#pragma warning disable IDE0051`
`67`	`67`	`private const int XXH_ACC_NB = XXH_STRIPE_LEN / sizeof(ulong);`
`68`		`-#pragma warning restore IDE0051`
`69`	`68`
`70`	`69`	`#endregion`
`71`	`70`	`}`