Replace explicit type mentions with object pattern

morelinq · Aug 6, 2020 · 8b66c50 · 8b66c50
1 parent 07bd086
commit 8b66c50
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/MoreLinq.Test/AggregateTest.cs b/MoreLinq.Test/AggregateTest.cs
@@ -110,8 +110,8 @@ public void SevenUniqueAccumulators()
                         0, (s, e) => s + e.Num,
                         0, (s, e) => e.Num % 2 == 0 ? s + e.Num : s,
                         0, (s, _) => s + 1,
-                        (int?)null, (s, e) => s is int n ? Math.Min(n, e.Num) : e.Num,
-                        (int?)null, (s, e) => s is int n ? Math.Max(n, e.Num) : e.Num,
+                        (int?)null, (s, e) => s is {} n ? Math.Min(n, e.Num) : e.Num,
+                        (int?)null, (s, e) => s is {} n ? Math.Max(n, e.Num) : e.Num,
                         new HashSet<int>(), (s, e) => { s.Add(e.Str.Length); return s; },
                         new List<(int Num, string Str)>(), (s, e) => { s.Add((e.Num, e.Str)); return s; },
                         (sum, esum, count, min, max, lengths, items) => new
@@ -120,8 +120,8 @@ public void SevenUniqueAccumulators()
                             EvenSum       = esum,
                             Count         = count,
                             Average       = (double)sum / count,
-                            Min           = min is int mn ? mn : throw new InvalidOperationException(),
-                            Max           = max is int mx ? mx : throw new InvalidOperationException(),
+                            Min           = min is {} mn ? mn : throw new InvalidOperationException(),
+                            Max           = max is {} mx ? mx : throw new InvalidOperationException(),
                             UniqueLengths = lengths,
                             Items         = items,
                         }

diff --git a/MoreLinq.Test/ChooseTest.cs b/MoreLinq.Test/ChooseTest.cs
@@ -75,7 +75,7 @@ static class Option<T>
         public void ThoseThatAreIntegers()
         {
             new int?[] { 0, 1, 2, null, 4, null, 6, null, null, 9 }
-                .Choose(e => e is int n ? Option.Some(n) : Option<int>.None)
+                .Choose(e => e is {} n ? Option.Some(n) : Option<int>.None)
                 .AssertSequenceEqual(0, 1, 2, 4, 6, 9);
         }
 

diff --git a/MoreLinq/AssertCount.cs b/MoreLinq/AssertCount.cs
@@ -89,7 +89,7 @@ static IEnumerable<TSource> AssertCountImpl<TSource>(IEnumerable<TSource> source
             if (errorSelector == null) throw new ArgumentNullException(nameof(errorSelector));
 
             return
-                source.TryGetCollectionCount() is int collectionCount
+                source.TryGetCollectionCount() is {} collectionCount
                 ? collectionCount == count
                   ? source
                   : From<TSource>(() => throw errorSelector(collectionCount.CompareTo(count), count))

diff --git a/MoreLinq/Backsert.cs b/MoreLinq/Backsert.cs
@@ -72,7 +72,7 @@ public static IEnumerable<T> Backsert<T>(this IEnumerable<T> first, IEnumerable<
                 if (e.MoveNext())
                 {
                     var (_, countdown) = e.Current;
-                    if (countdown is int n && n != index - 1)
+                    if (countdown is {} n && n != index - 1)
                         throw new ArgumentOutOfRangeException(nameof(index), "Insertion index is greater than the length of the first sequence.");
 
                     do

diff --git a/MoreLinq/CountDown.cs b/MoreLinq/CountDown.cs
@@ -57,9 +57,9 @@ public static IEnumerable<TResult> CountDown<T, TResult>(this IEnumerable<T> sou
             if (source == null) throw new ArgumentNullException(nameof(source));
             if (resultSelector == null) throw new ArgumentNullException(nameof(resultSelector));
 
-            return source.TryAsListLike() is IListLike<T> listLike
+            return source.TryAsListLike() is {} listLike
                    ? IterateList(listLike)
-                   : source.TryGetCollectionCount() is int collectionCount
+                   : source.TryGetCollectionCount() is {} collectionCount
                      ? IterateCollection(collectionCount)
                      : IterateSequence();
 

diff --git a/MoreLinq/CountMethods.cs b/MoreLinq/CountMethods.cs
@@ -167,11 +167,11 @@ public static int CompareCount<TFirst, TSecond>(this IEnumerable<TFirst> first,
             if (first == null) throw new ArgumentNullException(nameof(first));
             if (second == null) throw new ArgumentNullException(nameof(second));
 
-            if (first.TryGetCollectionCount() is int firstCount)
+            if (first.TryGetCollectionCount() is {} firstCount)
             {
                 return firstCount.CompareTo(second.TryGetCollectionCount() ?? second.CountUpTo(firstCount + 1));
             }
-            else if (second.TryGetCollectionCount() is int secondCount)
+            else if (second.TryGetCollectionCount() is {} secondCount)
             {
                 return first.CountUpTo(secondCount + 1).CompareTo(secondCount);
             }

diff --git a/MoreLinq/EndsWith.cs b/MoreLinq/EndsWith.cs
@@ -74,8 +74,8 @@ public static bool EndsWith<T>(this IEnumerable<T> first, IEnumerable<T> second,
             comparer ??= EqualityComparer<T>.Default;
 
             List<T> secondList;
-            return second.TryGetCollectionCount() is int secondCount
-                   ? first.TryGetCollectionCount() is int firstCount && secondCount > firstCount
+            return second.TryGetCollectionCount() is {} secondCount
+                   ? first.TryGetCollectionCount() is {} firstCount && secondCount > firstCount
                      ? false
                      : Impl(second, secondCount)
                    : Impl(secondList = second.ToList(), secondList.Count);

diff --git a/MoreLinq/Experimental/Await.cs b/MoreLinq/Experimental/Await.cs
@@ -636,7 +636,7 @@ void OnPendingCompleted()
                         onEnd();
                 }
 
-                var concurrencyGate = maxConcurrency is int count
+                var concurrencyGate = maxConcurrency is {} count
                                     ? new ConcurrencyGate(count)
                                     : ConcurrencyGate.Unbounded;
 

diff --git a/MoreLinq/Experimental/TrySingle.cs b/MoreLinq/Experimental/TrySingle.cs
@@ -115,7 +115,7 @@ public static TResult TrySingle<T, TCardinality, TResult>(this IEnumerable<T> so
                     };
                     return resultSelector(one, item);
                 }
-                case int _:
+                case {}:
                     return resultSelector(many, default);
                 default:
                 {

diff --git a/MoreLinq/FallbackIfEmpty.cs b/MoreLinq/FallbackIfEmpty.cs
@@ -161,7 +161,7 @@ static IEnumerable<T> FallbackIfEmptyImpl<T>(IEnumerable<T> source,
             int? count, T fallback1, T fallback2, T fallback3, T fallback4,
             IEnumerable<T> fallback)
         {
-            return source.TryGetCollectionCount() is int collectionCount
+            return source.TryGetCollectionCount() is {} collectionCount
                  ? collectionCount == 0 ? Fallback() : source
                  : _();
 

diff --git a/MoreLinq/Flatten.cs b/MoreLinq/Flatten.cs
@@ -110,7 +110,7 @@ public static IEnumerable<object> Flatten(this IEnumerable source, Func<object,
 
                         while (e.MoveNext())
                         {
-                            if (selector(e.Current) is IEnumerable inner)
+                            if (selector(e.Current) is {} inner)
                             {
                                 stack.Push(e);
                                 e = inner.GetEnumerator();

diff --git a/MoreLinq/PadStart.cs b/MoreLinq/PadStart.cs
@@ -119,7 +119,7 @@ static IEnumerable<T> PadStartImpl<T>(IEnumerable<T> source,
             int width, T padding, Func<int, T> paddingSelector)
         {
             return
-                source.TryGetCollectionCount() is int collectionCount
+                source.TryGetCollectionCount() is {} collectionCount
                 ? collectionCount >= width
                   ? source
                   : Enumerable.Range(0, width - collectionCount)

diff --git a/MoreLinq/SkipLast.cs b/MoreLinq/SkipLast.cs
@@ -41,7 +41,7 @@ public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source, int count)
                 return source;
 
             return
-                source.TryGetCollectionCount() is int collectionCount
+                source.TryGetCollectionCount() is {} collectionCount
                 ? source.Take(collectionCount - count)
                 : source.CountDown(count, (e, cd) => (Element: e, Countdown: cd ))
                         .TakeWhile(e => e.Countdown == null)

diff --git a/MoreLinq/StartsWith.cs b/MoreLinq/StartsWith.cs
@@ -73,8 +73,8 @@ public static bool StartsWith<T>(this IEnumerable<T> first, IEnumerable<T> secon
             if (first == null) throw new ArgumentNullException(nameof(first));
             if (second == null) throw new ArgumentNullException(nameof(second));
 
-            if (first.TryGetCollectionCount() is int firstCount &&
-                second.TryGetCollectionCount() is int secondCount &&
+            if (first.TryGetCollectionCount() is {} firstCount &&
+                second.TryGetCollectionCount() is {} secondCount &&
                 secondCount > firstCount)
             {
                 return false;

diff --git a/MoreLinq/TakeLast.cs b/MoreLinq/TakeLast.cs
@@ -54,7 +54,7 @@ public static IEnumerable<TSource> TakeLast<TSource>(this IEnumerable<TSource> s
                 return Enumerable.Empty<TSource>();
 
             return
-                source.TryGetCollectionCount() is int collectionCount
+                source.TryGetCollectionCount() is {} collectionCount
                 ? source.Slice(Math.Max(0, collectionCount - count), int.MaxValue)
                 : source.CountDown(count, (e, cd) => (Element: e, Countdown: cd))
                         .SkipWhile(e => e.Countdown == null)