Code improvements

pfpack · Aug 13, 2023 · a3c79cd · a3c79cd
1 parent 3abcd4a
commit a3c79cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Functional/Filter.cs b/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Functional/Filter.cs
@@ -16,7 +16,7 @@ public static void Filter_PredicateIsNull_ExpectArgumentNullException(
         bool isSourceDefault)
     {
         var source = isSourceDefault ? default : new[] { SomeString, LowerSomeString }.InitializeFlatArray();
-        Predicate<string> predicate = null!;
+        Func<string, bool> predicate = null!;
 
         var ex = Assert.Throws<ArgumentNullException>(Test);
         Assert.Equal("predicate", ex.ParamName);

diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Functional.Filter.cs b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Functional.Filter.cs
@@ -2,7 +2,7 @@ namespace System;
 
 partial struct FlatArray<T>
 {
-    public FlatArray<T> Filter(Predicate<T> predicate)
+    public FlatArray<T> Filter(Func<T, bool> predicate)
     {
         _ = predicate ?? throw new ArgumentNullException(nameof(predicate));
 
@@ -11,9 +11,9 @@ public FlatArray<T> Filter(Predicate<T> predicate)
             return default;
         }
 
-        var startLength = length < InnerAllocHelper.DefaultPositiveCapacity ? length : InnerAllocHelper.DefaultPositiveCapacity;
+        var initialCapacity = length < InnerAllocHelper.DefaultPositiveCapacity ? length : InnerAllocHelper.DefaultPositiveCapacity;
 
-        var resultItems = new T[startLength];
+        var resultItems = new T[initialCapacity];
         var resultLength = 0;
 
         for (int i = 0; i < length; i++)
@@ -30,8 +30,7 @@ public FlatArray<T> Filter(Predicate<T> predicate)
                 InnerBufferHelper.EnlargeBuffer(ref resultItems);
             }
 
-            resultItems[resultLength] = item;
-            resultLength++;
+            resultItems[resultLength++] = item;
         }
 
         if (resultLength == default)
@@ -51,9 +50,9 @@ public FlatArray<T> Filter(Func<T, int, bool> predicate)
             return default;
         }
 
-        var startLength = length < InnerAllocHelper.DefaultPositiveCapacity ? length : InnerAllocHelper.DefaultPositiveCapacity;
+        var initialCapacity = length < InnerAllocHelper.DefaultPositiveCapacity ? length : InnerAllocHelper.DefaultPositiveCapacity;
 
-        var resultItems = new T[startLength];
+        var resultItems = new T[initialCapacity];
         var resultLength = 0;
 
         for (int i = 0; i < length; i++)
@@ -70,8 +69,7 @@ public FlatArray<T> Filter(Func<T, int, bool> predicate)
                 InnerBufferHelper.EnlargeBuffer(ref resultItems);
             }
 
-            resultItems[resultLength] = item;
-            resultLength++;
+            resultItems[resultLength++] = item;
         }
 
         if (resultLength == default)