浏览代码

Remove some unnecessary cancellation token passing.

Bart De Smet 7 年之前
父节点
当前提交
b5a356a745

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

@@ -193,7 +193,7 @@ namespace System.Linq
 
                 try
                 {
-                    while (await enu.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                    while (await enu.MoveNextAsync().ConfigureAwait(false))
                     {
                         var item = enu.Current;
                         if (s.Add(_keySelector(item)))
@@ -339,7 +339,7 @@ namespace System.Linq
 
                 try
                 {
-                    while (await enu.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                    while (await enu.MoveNextAsync().ConfigureAwait(false))
                     {
                         var item = enu.Current;
                         if (s.Add(await _keySelector(item).ConfigureAwait(false)))

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

@@ -36,12 +36,12 @@ namespace System.Linq
 
             try
             {
-                if (!await e.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                if (!await e.MoveNextAsync().ConfigureAwait(false))
                     throw new InvalidOperationException(Strings.NO_ELEMENTS);
 
                 var max = e.Current;
 
-                while (await e.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                while (await e.MoveNextAsync().ConfigureAwait(false))
                 {
                     var cur = e.Current;
 

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

@@ -36,12 +36,12 @@ namespace System.Linq
 
             try
             {
-                if (!await e.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                if (!await e.MoveNextAsync().ConfigureAwait(false))
                     throw new InvalidOperationException(Strings.NO_ELEMENTS);
 
                 var min = e.Current;
 
-                while (await e.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                while (await e.MoveNextAsync().ConfigureAwait(false))
                 {
                     var cur = e.Current;
 

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

@@ -116,14 +116,14 @@ namespace System.Linq
 
             try
             {
-                if (!await e.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                if (!await e.MoveNextAsync().ConfigureAwait(false))
                     throw new InvalidOperationException(Strings.NO_ELEMENTS);
 
                 var current = e.Current;
                 var resKey = keySelector(current);
                 result.Add(current);
 
-                while (await e.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                while (await e.MoveNextAsync().ConfigureAwait(false))
                 {
                     var cur = e.Current;
                     var key = keySelector(cur);
@@ -156,14 +156,14 @@ namespace System.Linq
 
             try
             {
-                if (!await e.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                if (!await e.MoveNextAsync().ConfigureAwait(false))
                     throw new InvalidOperationException(Strings.NO_ELEMENTS);
 
                 var current = e.Current;
                 var resKey = await keySelector(current).ConfigureAwait(false);
                 result.Add(current);
 
-                while (await e.MoveNextAsync(cancellationToken).ConfigureAwait(false))
+                while (await e.MoveNextAsync().ConfigureAwait(false))
                 {
                     var cur = e.Current;
                     var key = await keySelector(cur).ConfigureAwait(false);

+ 3 - 3
Ix.NET/Source/System.Linq.Async/System/Linq/AsyncListPartition.cs

@@ -144,11 +144,11 @@ namespace System.Linq
             {
                 return Task.FromResult(
 #if NO_ARRAY_EMPTY
-                EmptyArray<TSource>.Value
+                    EmptyArray<TSource>.Value
 #else
-                Array.Empty<TSource>()
+                    Array.Empty<TSource>()
 #endif
-                    );
+                );
             }
 
             var array = new TSource[count];