Merge pull request #906 from dotnet/MiscCleanup

Some minor cleanup
dotnet · May 24, 2019 · ad58020 · ad58020
2 parents 447c3fb + 5deb0f1
commit ad58020
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Intersect.cs b/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Intersect.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information. 
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Join.cs b/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Join.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information. 
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SelectMany.cs b/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SelectMany.cs
@@ -364,11 +364,11 @@ public ValueTask<int> GetCountAsync(bool onlyIfCheap, CancellationToken cancella
 
                 return Core(cancellationToken);
 
-                async ValueTask<int> Core(CancellationToken _cancellationToken)
+                async ValueTask<int> Core(CancellationToken cancellationToken)
                 {
                     var count = 0;
 
-                    await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
+                    await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         checked
                         {
@@ -503,11 +503,11 @@ public ValueTask<int> GetCountAsync(bool onlyIfCheap, CancellationToken cancella
 
                 return Core(cancellationToken);
 
-                async ValueTask<int> Core(CancellationToken _cancellationToken)
+                async ValueTask<int> Core(CancellationToken cancellationToken)
                 {
                     var count = 0;
 
-                    await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
+                    await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         var items = await _selector(element).ConfigureAwait(false);
 
@@ -645,13 +645,13 @@ public ValueTask<int> GetCountAsync(bool onlyIfCheap, CancellationToken cancella
 
                 return Core(cancellationToken);
 
-                async ValueTask<int> Core(CancellationToken _cancellationToken)
+                async ValueTask<int> Core(CancellationToken cancellationToken)
                 {
                     var count = 0;
 
-                    await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
+                    await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
-                        var items = await _selector(element, _cancellationToken).ConfigureAwait(false);
+                        var items = await _selector(element, cancellationToken).ConfigureAwait(false);
 
                         checked
                         {

diff --git a/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SequenceEqual.cs b/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SequenceEqual.cs
@@ -20,10 +20,7 @@ public static ValueTask<bool> SequenceEqualAsync<TSource>(this IAsyncEnumerable<
             if (second == null)
                 throw Error.ArgumentNull(nameof(second));
 
-            if (comparer == null)
-            {
-                comparer = EqualityComparer<TSource>.Default;
-            }
+            comparer ??= EqualityComparer<TSource>.Default;
 
             if (first is ICollection<TSource> firstCol && second is ICollection<TSource> secondCol)
             {

diff --git a/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SkipWhile.cs b/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SkipWhile.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information. 
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 

diff --git a/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/TakeWhile.cs b/Ix.NET/Source/System.Linq.Async/System/Linq/Operators/TakeWhile.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information. 
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;