Skip to content

Commit 46f5123

Browse files
committed
Merge branch 'master' of https://github.com/dotnet/reactive into NullableReferenceTypes
2 parents d09b56f + ad58020 commit 46f5123

File tree

6 files changed

+8
-15
lines changed

6 files changed

+8
-15
lines changed

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Intersect.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.Collections.Generic;
6-
using System.Diagnostics;
76
using System.Threading;
87
using System.Threading.Tasks;
98

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Join.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.Collections.Generic;
6-
using System.Diagnostics;
76
using System.Threading;
87
using System.Threading.Tasks;
98

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SelectMany.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,11 @@ public ValueTask<int> GetCountAsync(bool onlyIfCheap, CancellationToken cancella
364364

365365
return Core(cancellationToken);
366366

367-
async ValueTask<int> Core(CancellationToken _cancellationToken)
367+
async ValueTask<int> Core(CancellationToken cancellationToken)
368368
{
369369
var count = 0;
370370

371-
await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
371+
await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
372372
{
373373
checked
374374
{
@@ -503,11 +503,11 @@ public ValueTask<int> GetCountAsync(bool onlyIfCheap, CancellationToken cancella
503503

504504
return Core(cancellationToken);
505505

506-
async ValueTask<int> Core(CancellationToken _cancellationToken)
506+
async ValueTask<int> Core(CancellationToken cancellationToken)
507507
{
508508
var count = 0;
509509

510-
await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
510+
await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
511511
{
512512
var items = await _selector(element).ConfigureAwait(false);
513513

@@ -645,13 +645,13 @@ public ValueTask<int> GetCountAsync(bool onlyIfCheap, CancellationToken cancella
645645

646646
return Core(cancellationToken);
647647

648-
async ValueTask<int> Core(CancellationToken _cancellationToken)
648+
async ValueTask<int> Core(CancellationToken cancellationToken)
649649
{
650650
var count = 0;
651651

652-
await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
652+
await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
653653
{
654-
var items = await _selector(element, _cancellationToken).ConfigureAwait(false);
654+
var items = await _selector(element, cancellationToken).ConfigureAwait(false);
655655

656656
checked
657657
{

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SequenceEqual.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ public static ValueTask<bool> SequenceEqualAsync<TSource>(this IAsyncEnumerable<
2020
if (second == null)
2121
throw Error.ArgumentNull(nameof(second));
2222

23-
if (comparer == null)
24-
{
25-
comparer = EqualityComparer<TSource>.Default;
26-
}
23+
comparer ??= EqualityComparer<TSource>.Default;
2724

2825
if (first is ICollection<TSource> firstCol && second is ICollection<TSource> secondCol)
2926
{

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SkipWhile.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.Collections.Generic;
6-
using System.Diagnostics;
76
using System.Threading;
87
using System.Threading.Tasks;
98

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/TakeWhile.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.Collections.Generic;
6-
using System.Diagnostics;
76
using System.Threading;
87
using System.Threading.Tasks;
98

0 commit comments

Comments
 (0)