Browse Source

Renaming some methods to use Core suffix.

Bart De Smet 8 years ago
parent
commit
2e45ab5b38

+ 8 - 8
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Aggregate.cs

@@ -27,7 +27,7 @@ namespace System.Linq
             if (accumulator == null)
                 throw new ArgumentNullException(nameof(accumulator));
 
-            return Aggregate_(source, accumulator, cancellationToken);
+            return AggregateCore(source, accumulator, cancellationToken);
         }
 
         public static Task<TSource> Aggregate<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, TSource, Task<TSource>> accumulator)
@@ -47,7 +47,7 @@ namespace System.Linq
             if (accumulator == null)
                 throw new ArgumentNullException(nameof(accumulator));
 
-            return Aggregate_(source, accumulator, cancellationToken);
+            return AggregateCore(source, accumulator, cancellationToken);
         }
 
         public static Task<TAccumulate> Aggregate<TSource, TAccumulate>(this IAsyncEnumerable<TSource> source, TAccumulate seed, Func<TAccumulate, TSource, TAccumulate> accumulator)
@@ -111,7 +111,7 @@ namespace System.Linq
             if (resultSelector == null)
                 throw new ArgumentNullException(nameof(resultSelector));
 
-            return Aggregate_(source, seed, accumulator, resultSelector, cancellationToken);
+            return AggregateCore(source, seed, accumulator, resultSelector, cancellationToken);
         }
 
         public static Task<TResult> Aggregate<TSource, TAccumulate, TResult>(this IAsyncEnumerable<TSource> source, TAccumulate seed, Func<TAccumulate, TSource, Task<TAccumulate>> accumulator, Func<TAccumulate, Task<TResult>> resultSelector)
@@ -135,10 +135,10 @@ namespace System.Linq
             if (resultSelector == null)
                 throw new ArgumentNullException(nameof(resultSelector));
 
-            return Aggregate_(source, seed, accumulator, resultSelector, cancellationToken);
+            return AggregateCore(source, seed, accumulator, resultSelector, cancellationToken);
         }
 
-        private static async Task<TResult> Aggregate_<TSource, TAccumulate, TResult>(IAsyncEnumerable<TSource> source, TAccumulate seed, Func<TAccumulate, TSource, TAccumulate> accumulator, Func<TAccumulate, TResult> resultSelector, CancellationToken cancellationToken)
+        private static async Task<TResult> AggregateCore<TSource, TAccumulate, TResult>(IAsyncEnumerable<TSource> source, TAccumulate seed, Func<TAccumulate, TSource, TAccumulate> accumulator, Func<TAccumulate, TResult> resultSelector, CancellationToken cancellationToken)
         {
             var acc = seed;
 
@@ -159,7 +159,7 @@ namespace System.Linq
             return resultSelector(acc);
         }
 
-        private static async Task<TSource> Aggregate_<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, TSource, TSource> accumulator, CancellationToken cancellationToken)
+        private static async Task<TSource> AggregateCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, TSource, TSource> accumulator, CancellationToken cancellationToken)
         {
             var first = true;
             var acc = default(TSource);
@@ -185,7 +185,7 @@ namespace System.Linq
             return acc;
         }
 
-        private static async Task<TResult> Aggregate_<TSource, TAccumulate, TResult>(IAsyncEnumerable<TSource> source, TAccumulate seed, Func<TAccumulate, TSource, Task<TAccumulate>> accumulator, Func<TAccumulate, Task<TResult>> resultSelector, CancellationToken cancellationToken)
+        private static async Task<TResult> AggregateCore<TSource, TAccumulate, TResult>(IAsyncEnumerable<TSource> source, TAccumulate seed, Func<TAccumulate, TSource, Task<TAccumulate>> accumulator, Func<TAccumulate, Task<TResult>> resultSelector, CancellationToken cancellationToken)
         {
             var acc = seed;
 
@@ -206,7 +206,7 @@ namespace System.Linq
             return await resultSelector(acc).ConfigureAwait(false);
         }
 
-        private static async Task<TSource> Aggregate_<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, TSource, Task<TSource>> accumulator, CancellationToken cancellationToken)
+        private static async Task<TSource> AggregateCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, TSource, Task<TSource>> accumulator, CancellationToken cancellationToken)
         {
             var first = true;
             var acc = default(TSource);

+ 4 - 4
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/All.cs

@@ -37,7 +37,7 @@ namespace System.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return All_(source, predicate, cancellationToken);
+            return AllCore(source, predicate, cancellationToken);
         }
 
         public static Task<bool> All<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, Task<bool>> predicate, CancellationToken cancellationToken)
@@ -47,10 +47,10 @@ namespace System.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return All_(source, predicate, cancellationToken);
+            return AllCore(source, predicate, cancellationToken);
         }
 
-        private static async Task<bool> All_<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate, CancellationToken cancellationToken)
+        private static async Task<bool> AllCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -70,7 +70,7 @@ namespace System.Linq
             return true;
         }
 
-        private static async Task<bool> All_<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, Task<bool>> predicate, CancellationToken cancellationToken)
+        private static async Task<bool> AllCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, Task<bool>> predicate, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 

+ 4 - 4
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Any.cs

@@ -45,7 +45,7 @@ namespace System.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Any_(source, predicate, cancellationToken);
+            return AnyCore(source, predicate, cancellationToken);
         }
 
         public static Task<bool> Any<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, Task<bool>> predicate, CancellationToken cancellationToken)
@@ -55,7 +55,7 @@ namespace System.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Any_(source, predicate, cancellationToken);
+            return AnyCore(source, predicate, cancellationToken);
         }
 
         public static async Task<bool> Any<TSource>(this IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
@@ -75,7 +75,7 @@ namespace System.Linq
             }
         }
 
-        private static async Task<bool> Any_<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate, CancellationToken cancellationToken)
+        private static async Task<bool> AnyCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -95,7 +95,7 @@ namespace System.Linq
             return false;
         }
 
-        private static async Task<bool> Any_<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, Task<bool>> predicate, CancellationToken cancellationToken)
+        private static async Task<bool> AnyCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, Task<bool>> predicate, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 

+ 20 - 20
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Average.Generated.cs

@@ -15,7 +15,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<double> Average(this IAsyncEnumerable<int> source, CancellationToken cancellationToken)
@@ -23,7 +23,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<double> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, int> selector)
@@ -71,7 +71,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<double> Average(this IAsyncEnumerable<long> source, CancellationToken cancellationToken)
@@ -79,7 +79,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<double> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, long> selector)
@@ -127,7 +127,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<float> Average(this IAsyncEnumerable<float> source, CancellationToken cancellationToken)
@@ -135,7 +135,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<float> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, float> selector)
@@ -183,7 +183,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<double> Average(this IAsyncEnumerable<double> source, CancellationToken cancellationToken)
@@ -191,7 +191,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<double> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, double> selector)
@@ -239,7 +239,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<decimal> Average(this IAsyncEnumerable<decimal> source, CancellationToken cancellationToken)
@@ -247,7 +247,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<decimal> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, decimal> selector)
@@ -295,7 +295,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<double?> Average(this IAsyncEnumerable<int?> source, CancellationToken cancellationToken)
@@ -303,7 +303,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<double?> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, int?> selector)
@@ -351,7 +351,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<double?> Average(this IAsyncEnumerable<long?> source, CancellationToken cancellationToken)
@@ -359,7 +359,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<double?> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, long?> selector)
@@ -407,7 +407,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<float?> Average(this IAsyncEnumerable<float?> source, CancellationToken cancellationToken)
@@ -415,7 +415,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<float?> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, float?> selector)
@@ -463,7 +463,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<double?> Average(this IAsyncEnumerable<double?> source, CancellationToken cancellationToken)
@@ -471,7 +471,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<double?> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, double?> selector)
@@ -519,7 +519,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<decimal?> Average(this IAsyncEnumerable<decimal?> source, CancellationToken cancellationToken)
@@ -527,7 +527,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<decimal?> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, decimal?> selector)

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Average.Generated.tt

@@ -40,7 +40,7 @@ foreach (var o in os)
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, CancellationToken.None);
+            return AverageCore(source, CancellationToken.None);
         }
 
         public static Task<<#=o.res#>> Average(this IAsyncEnumerable<<#=o.type#>> source, CancellationToken cancellationToken)
@@ -48,7 +48,7 @@ foreach (var o in os)
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Average_(source, cancellationToken);
+            return AverageCore(source, cancellationToken);
         }
 
         public static Task<<#=o.res#>> Average<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, <#=o.type#>> selector)

+ 10 - 10
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Average.cs

@@ -10,7 +10,7 @@ namespace System.Linq
 {
     public static partial class AsyncEnumerable
     {
-        private static async Task<double> Average_(this IAsyncEnumerable<int> source, CancellationToken cancellationToken)
+        private static async Task<double> AverageCore(this IAsyncEnumerable<int> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -40,7 +40,7 @@ namespace System.Linq
             }
         }
 
-        private static async Task<double?> Average_(IAsyncEnumerable<int?> source, CancellationToken cancellationToken)
+        private static async Task<double?> AverageCore(IAsyncEnumerable<int?> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -78,7 +78,7 @@ namespace System.Linq
             return null;
         }
 
-        private static async Task<double> Average_(IAsyncEnumerable<long> source, CancellationToken cancellationToken)
+        private static async Task<double> AverageCore(IAsyncEnumerable<long> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -108,7 +108,7 @@ namespace System.Linq
             }
         }
 
-        private static async Task<double?> Average_(IAsyncEnumerable<long?> source, CancellationToken cancellationToken)
+        private static async Task<double?> AverageCore(IAsyncEnumerable<long?> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -146,7 +146,7 @@ namespace System.Linq
             return null;
         }
 
-        private static async Task<double> Average_(IAsyncEnumerable<double> source, CancellationToken cancellationToken)
+        private static async Task<double> AverageCore(IAsyncEnumerable<double> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -176,7 +176,7 @@ namespace System.Linq
             }
         }
 
-        private static async Task<double?> Average_(IAsyncEnumerable<double?> source, CancellationToken cancellationToken)
+        private static async Task<double?> AverageCore(IAsyncEnumerable<double?> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -214,7 +214,7 @@ namespace System.Linq
             return null;
         }
 
-        private static async Task<float> Average_(IAsyncEnumerable<float> source, CancellationToken cancellationToken)
+        private static async Task<float> AverageCore(IAsyncEnumerable<float> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -241,7 +241,7 @@ namespace System.Linq
             }
         }
 
-        private static async Task<float?> Average_(IAsyncEnumerable<float?> source, CancellationToken cancellationToken)
+        private static async Task<float?> AverageCore(IAsyncEnumerable<float?> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -279,7 +279,7 @@ namespace System.Linq
             return null;
         }
 
-        private static async Task<decimal> Average_(IAsyncEnumerable<decimal> source, CancellationToken cancellationToken)
+        private static async Task<decimal> AverageCore(IAsyncEnumerable<decimal> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 
@@ -306,7 +306,7 @@ namespace System.Linq
             }
         }
 
-        private static async Task<decimal?> Average_(IAsyncEnumerable<decimal?> source, CancellationToken cancellationToken)
+        private static async Task<decimal?> AverageCore(IAsyncEnumerable<decimal?> source, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ElementAt.cs

@@ -25,10 +25,10 @@ namespace System.Linq
             if (index < 0)
                 throw new ArgumentOutOfRangeException(nameof(index));
 
-            return ElementAt_(source, index, cancellationToken);
+            return ElementAtCore(source, index, cancellationToken);
         }
 
-        private static async Task<TSource> ElementAt_<TSource>(IAsyncEnumerable<TSource> source, int index, CancellationToken cancellationToken)
+        private static async Task<TSource> ElementAtCore<TSource>(IAsyncEnumerable<TSource> source, int index, CancellationToken cancellationToken)
         {
             if (source is IList<TSource> list)
             {

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ElementAtOrDefault.cs

@@ -25,10 +25,10 @@ namespace System.Linq
             if (index < 0)
                 throw new ArgumentOutOfRangeException(nameof(index));
 
-            return ElementAtOrDefault_(source, index, cancellationToken);
+            return ElementAtOrDefaultCore(source, index, cancellationToken);
         }
 
-        private static async Task<TSource> ElementAtOrDefault_<TSource>(IAsyncEnumerable<TSource> source, int index, CancellationToken cancellationToken)
+        private static async Task<TSource> ElementAtOrDefaultCore<TSource>(IAsyncEnumerable<TSource> source, int index, CancellationToken cancellationToken)
         {
             if (index >= 0)
             {

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/First.cs

@@ -23,7 +23,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return First_(source, cancellationToken);
+            return FirstCore(source, cancellationToken);
         }
 
         public static Task<TSource> First<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate)
@@ -66,7 +66,7 @@ namespace System.Linq
             return source.Where(predicate).First(cancellationToken);
         }
 
-        private static async Task<TSource> First_<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
+        private static async Task<TSource> FirstCore<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
         {
             var list = source as IList<TSource>;
             if (list?.Count > 0)

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/FirstOrDefault.cs

@@ -23,7 +23,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return FirstOrDefault_(source, cancellationToken);
+            return FirstOrDefaultCore(source, cancellationToken);
         }
 
         public static Task<TSource> FirstOrDefault<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate)
@@ -66,7 +66,7 @@ namespace System.Linq
             return source.Where(predicate).FirstOrDefault(cancellationToken);
         }
 
-        private static async Task<TSource> FirstOrDefault_<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
+        private static async Task<TSource> FirstOrDefaultCore<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
         {
             var list = source as IList<TSource>;
             if (list?.Count > 0)

+ 4 - 4
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ForEach.cs

@@ -47,7 +47,7 @@ namespace System.Linq
             if (action == null)
                 throw new ArgumentNullException(nameof(action));
 
-            return ForEachAsync_(source, action, cancellationToken);
+            return ForEachAsyncCore(source, action, cancellationToken);
         }
 
         public static Task ForEachAsync<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, Task> action)
@@ -107,10 +107,10 @@ namespace System.Linq
             if (action == null)
                 throw new ArgumentNullException(nameof(action));
 
-            return ForEachAsync_(source, action, cancellationToken);
+            return ForEachAsyncCore(source, action, cancellationToken);
         }
 
-        private static async Task ForEachAsync_<TSource>(IAsyncEnumerable<TSource> source, Action<TSource, int> action, CancellationToken cancellationToken)
+        private static async Task ForEachAsyncCore<TSource>(IAsyncEnumerable<TSource> source, Action<TSource, int> action, CancellationToken cancellationToken)
         {
             var index = 0;
 
@@ -129,7 +129,7 @@ namespace System.Linq
             }
         }
 
-        private static async Task ForEachAsync_<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, int, CancellationToken, Task> action, CancellationToken cancellationToken)
+        private static async Task ForEachAsyncCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, int, CancellationToken, Task> action, CancellationToken cancellationToken)
         {
             var index = 0;
 

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Last.cs

@@ -23,7 +23,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Last_(source, cancellationToken);
+            return LastCore(source, cancellationToken);
         }
 
         public static Task<TSource> Last<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate)
@@ -66,7 +66,7 @@ namespace System.Linq
             return source.Where(predicate).Last(cancellationToken);
         }
 
-        private static async Task<TSource> Last_<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
+        private static async Task<TSource> LastCore<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
         {
             var last = default(TSource);
             var hasLast = false;

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/LastOrDefault.cs

@@ -23,7 +23,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return LastOrDefault_(source, cancellationToken);
+            return LastOrDefaultCore(source, cancellationToken);
         }
 
         public static Task<TSource> LastOrDefault<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate)
@@ -66,7 +66,7 @@ namespace System.Linq
             return source.Where(predicate).LastOrDefault(cancellationToken);
         }
 
-        private static async Task<TSource> LastOrDefault_<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
+        private static async Task<TSource> LastOrDefaultCore<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
         {
             var last = default(TSource);
             var hasLast = false;

+ 1 - 1
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Max.cs

@@ -67,7 +67,7 @@ namespace System.Linq
             return source.Select(selector).Max(cancellationToken);
         }
 
-        private static async Task<TSource> Max_<TSource>(IAsyncEnumerable<TSource> source, IComparer<TSource> comparer, CancellationToken cancellationToken)
+        private static async Task<TSource> MaxCore<TSource>(IAsyncEnumerable<TSource> source, IComparer<TSource> comparer, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 

+ 1 - 1
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Min.cs

@@ -67,7 +67,7 @@ namespace System.Linq
             return source.Select(selector).Min(cancellationToken);
         }
 
-        private static async Task<TSource> Min_<TSource>(IAsyncEnumerable<TSource> source, IComparer<TSource> comparer, CancellationToken cancellationToken)
+        private static async Task<TSource> MinCore<TSource>(IAsyncEnumerable<TSource> source, IComparer<TSource> comparer, CancellationToken cancellationToken)
         {
             var e = source.GetAsyncEnumerator();
 

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SequenceEqual.cs

@@ -42,7 +42,7 @@ namespace System.Linq
             if (comparer == null)
                 throw new ArgumentNullException(nameof(comparer));
 
-            return SequenceEqual_(first, second, comparer, cancellationToken);
+            return SequenceEqualCore(first, second, comparer, cancellationToken);
         }
 
         public static Task<bool> SequenceEqual<TSource>(this IAsyncEnumerable<TSource> first, IAsyncEnumerable<TSource> second, CancellationToken cancellationToken)
@@ -55,7 +55,7 @@ namespace System.Linq
             return first.SequenceEqual(second, EqualityComparer<TSource>.Default, cancellationToken);
         }
 
-        private static async Task<bool> SequenceEqual_<TSource>(IAsyncEnumerable<TSource> first, IAsyncEnumerable<TSource> second, IEqualityComparer<TSource> comparer, CancellationToken cancellationToken)
+        private static async Task<bool> SequenceEqualCore<TSource>(IAsyncEnumerable<TSource> first, IAsyncEnumerable<TSource> second, IEqualityComparer<TSource> comparer, CancellationToken cancellationToken)
         {
             if (first is ICollection<TSource> firstCol && second is ICollection<TSource> secondCol && firstCol.Count != secondCol.Count)
             {

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Single.cs

@@ -23,7 +23,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return Single_(source, cancellationToken);
+            return SingleCore(source, cancellationToken);
         }
 
         public static Task<TSource> Single<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate)
@@ -66,7 +66,7 @@ namespace System.Linq
             return source.Where(predicate).Single(cancellationToken);
         }
 
-        private static async Task<TSource> Single_<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
+        private static async Task<TSource> SingleCore<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
         {
             if (source is IList<TSource> list)
             {

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SingleOrDefault.cs

@@ -23,7 +23,7 @@ namespace System.Linq
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            return SingleOrDefault_(source, cancellationToken);
+            return SingleOrDefaultCore(source, cancellationToken);
         }
 
         public static Task<TSource> SingleOrDefault<TSource>(this IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate)
@@ -66,7 +66,7 @@ namespace System.Linq
             return source.Where(predicate).SingleOrDefault(cancellationToken);
         }
 
-        private static async Task<TSource> SingleOrDefault_<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
+        private static async Task<TSource> SingleOrDefaultCore<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)
         {
             if (source is IList<TSource> list)
             {