Parcourir la source

Some minor cosmetics.

Bart De Smet il y a 6 ans
Parent
commit
cd755fd113

+ 0 - 1
Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Amb.cs

@@ -4,7 +4,6 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace System.Linq

+ 1 - 0
Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Buffer.cs

@@ -92,6 +92,7 @@ namespace System.Linq
                                 if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
                                     TSource item = _enumerator.Current;
+
                                     if (_index++ % _skip == 0)
                                     {
                                         _buffers.Enqueue(new List<TSource>(_count));

+ 3 - 3
Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Catch.cs

@@ -137,7 +137,7 @@ namespace System.Linq
                                 }
                                 catch (TException ex)
                                 {
-                                    // Note: Ideally we'd dipose of the previous enumerator before
+                                    // Note: Ideally we'd dispose of the previous enumerator before
                                     // invoking the handler, but we use this order to preserve
                                     // current behavior
                                     IAsyncEnumerable<TSource> inner = _handler(ex);
@@ -230,7 +230,7 @@ namespace System.Linq
                                 }
                                 catch (TException ex)
                                 {
-                                    // Note: Ideally we'd dipose of the previous enumerator before
+                                    // Note: Ideally we'd dispose of the previous enumerator before
                                     // invoking the handler, but we use this order to preserve
                                     // current behavior
                                     IAsyncEnumerable<TSource> inner = await _handler(ex).ConfigureAwait(false);
@@ -324,7 +324,7 @@ namespace System.Linq
                                 }
                                 catch (TException ex)
                                 {
-                                    // Note: Ideally we'd dipose of the previous enumerator before
+                                    // Note: Ideally we'd dispose of the previous enumerator before
                                     // invoking the handler, but we use this order to preserve
                                     // current behavior
                                     IAsyncEnumerable<TSource> inner = await _handler(ex, _cancellationToken).ConfigureAwait(false);

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

@@ -140,6 +140,7 @@ namespace System.Linq
                     while (await enu.MoveNextAsync().ConfigureAwait(false))
                     {
                         TSource item = enu.Current;
+
                         if (s.Add(_keySelector(item)))
                         {
                             count++;
@@ -196,6 +197,7 @@ namespace System.Linq
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
                             element = _enumerator.Current;
+
                             if (_set.Add(_keySelector(element)))
                             {
                                 _current = element;
@@ -222,6 +224,7 @@ namespace System.Linq
                     while (await enu.MoveNextAsync().ConfigureAwait(false))
                     {
                         TSource item = enu.Current;
+
                         if (s.Add(_keySelector(item)))
                         {
                             r.Add(item);
@@ -285,6 +288,7 @@ namespace System.Linq
                     while (await enu.MoveNextAsync().ConfigureAwait(false))
                     {
                         TSource item = enu.Current;
+
                         if (s.Add(await _keySelector(item).ConfigureAwait(false)))
                         {
                             count++;
@@ -341,6 +345,7 @@ namespace System.Linq
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
                             element = _enumerator.Current;
+
                             if (_set.Add(await _keySelector(element).ConfigureAwait(false)))
                             {
                                 _current = element;
@@ -367,6 +372,7 @@ namespace System.Linq
                     while (await enu.MoveNextAsync().ConfigureAwait(false))
                     {
                         TSource item = enu.Current;
+
                         if (s.Add(await _keySelector(item).ConfigureAwait(false)))
                         {
                             r.Add(item);
@@ -431,6 +437,7 @@ namespace System.Linq
                     while (await enu.MoveNextAsync().ConfigureAwait(false))
                     {
                         TSource item = enu.Current;
+
                         if (s.Add(await _keySelector(item, cancellationToken).ConfigureAwait(false)))
                         {
                             count++;
@@ -487,6 +494,7 @@ namespace System.Linq
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
                             element = _enumerator.Current;
+
                             if (_set.Add(await _keySelector(element, _cancellationToken).ConfigureAwait(false)))
                             {
                                 _current = element;
@@ -513,6 +521,7 @@ namespace System.Linq
                     while (await enu.MoveNextAsync().ConfigureAwait(false))
                     {
                         TSource item = enu.Current;
+
                         if (s.Add(await _keySelector(item, cancellationToken).ConfigureAwait(false)))
                         {
                             r.Add(item);

+ 3 - 0
Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/DistinctUntilChanged.cs

@@ -238,6 +238,7 @@ namespace System.Linq
                             {
                                 comparerEquals = _comparer.Equals(_currentKeyValue, key);
                             }
+
                             if (!_hasCurrentKey || !comparerEquals)
                             {
                                 _hasCurrentKey = true;
@@ -309,6 +310,7 @@ namespace System.Linq
                             {
                                 comparerEquals = _comparer.Equals(_currentKeyValue, key);
                             }
+
                             if (!_hasCurrentKey || !comparerEquals)
                             {
                                 _hasCurrentKey = true;
@@ -381,6 +383,7 @@ namespace System.Linq
                             {
                                 comparerEquals = _comparer.Equals(_currentKeyValue, key);
                             }
+
                             if (!_hasCurrentKey || !comparerEquals)
                             {
                                 _hasCurrentKey = true;

+ 0 - 1
Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Merge.cs

@@ -4,7 +4,6 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace System.Linq

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

@@ -167,6 +167,7 @@ namespace System.Linq
                     TKey key = keySelector(cur);
 
                     int cmp = compare(key, resKey);
+
                     if (cmp == 0)
                     {
                         result.Add(cur);
@@ -207,6 +208,7 @@ namespace System.Linq
                     TKey key = await keySelector(cur).ConfigureAwait(false);
 
                     int cmp = compare(key, resKey);
+
                     if (cmp == 0)
                     {
                         result.Add(cur);
@@ -248,6 +250,7 @@ namespace System.Linq
                     TKey key = await keySelector(cur, cancellationToken).ConfigureAwait(false);
 
                     int cmp = compare(key, resKey);
+
                     if (cmp == 0)
                     {
                         result.Add(cur);

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

@@ -10,10 +10,7 @@ namespace System.Linq
 {
     public static partial class AsyncEnumerableEx
     {
-        public static IAsyncEnumerable<TValue> Never<TValue>()
-        {
-            return NeverAsyncEnumerable<TValue>.Instance;
-        }
+        public static IAsyncEnumerable<TValue> Never<TValue>() => NeverAsyncEnumerable<TValue>.Instance;
 
         private sealed class NeverAsyncEnumerable<TValue> : IAsyncEnumerable<TValue>
         {
@@ -34,10 +31,7 @@ namespace System.Linq
                 private bool _once;
                 private TaskCompletionSource<bool> _task;
 
-                public NeverAsyncEnumerator(CancellationToken token)
-                {
-                    _token = token;
-                }
+                public NeverAsyncEnumerator(CancellationToken token) => _token = token;
 
                 public TValue Current => throw new InvalidOperationException();
 

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

@@ -38,10 +38,7 @@ namespace System.Linq
         {
             private readonly TResult _element;
 
-            public RepeatElementAsyncIterator(TResult element)
-            {
-                _element = element;
-            }
+            public RepeatElementAsyncIterator(TResult element) => _element = element;
 
             public override AsyncIteratorBase<TResult> Clone()
             {

+ 3 - 12
Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Return.cs

@@ -10,10 +10,7 @@ namespace System.Linq
 {
     public static partial class AsyncEnumerableEx
     {
-        public static IAsyncEnumerable<TValue> Return<TValue>(TValue value)
-        {
-            return new ReturnEnumerable<TValue>(value);
-        }
+        public static IAsyncEnumerable<TValue> Return<TValue>(TValue value) => new ReturnEnumerable<TValue>(value);
 
         // REVIEW: Add support for IAsyncPartition<T>.
 
@@ -21,10 +18,7 @@ namespace System.Linq
         {
             private readonly TValue _value;
 
-            public ReturnEnumerable(TValue value)
-            {
-                _value = value;
-            }
+            public ReturnEnumerable(TValue value) => _value = value;
 
             public IAsyncEnumerator<TValue> GetAsyncEnumerator(CancellationToken cancellationToken)
             {
@@ -43,10 +37,7 @@ namespace System.Linq
             {
                 private bool _once;
 
-                public ReturnEnumerator(TValue current)
-                {
-                    Current = current;
-                }
+                public ReturnEnumerator(TValue current) => Current = current;
 
                 public TValue Current { get; private set; }
 

+ 3 - 0
Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Scan.cs

@@ -128,6 +128,7 @@ namespace System.Linq
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
                             TSource item = _enumerator.Current;
+
                             if (!_hasSeed)
                             {
                                 _hasSeed = true;
@@ -266,6 +267,7 @@ namespace System.Linq
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
                             TSource item = _enumerator.Current;
+
                             if (!_hasSeed)
                             {
                                 _hasSeed = true;
@@ -341,6 +343,7 @@ namespace System.Linq
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
                             TSource item = _enumerator.Current;
+
                             if (!_hasSeed)
                             {
                                 _hasSeed = true;