Sfoglia il codice sorgente

Minor simplification of the code.

Bart De Smet 7 anni fa
parent
commit
051f53ecf5

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

@@ -70,36 +70,21 @@ namespace System.Linq
         {
             var first = await TryGetFirst(source, cancellationToken).ConfigureAwait(false);
 
-            if (first.HasValue)
-            {
-                return first.Value;
-            }
-
-            throw new InvalidOperationException(Strings.NO_ELEMENTS);
+            return first.HasValue ? first.Value : throw new InvalidOperationException(Strings.NO_ELEMENTS);
         }
 
         private static async Task<TSource> FirstCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate, CancellationToken cancellationToken)
         {
             var first = await TryGetFirst(source, predicate, cancellationToken).ConfigureAwait(false);
 
-            if (first.HasValue)
-            {
-                return first.Value;
-            }
-
-            throw new InvalidOperationException(Strings.NO_ELEMENTS);
+            return first.HasValue ? first.Value : throw new InvalidOperationException(Strings.NO_ELEMENTS);
         }
 
         private static async Task<TSource> FirstCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, Task<bool>> predicate, CancellationToken cancellationToken)
         {
             var first = await TryGetFirst(source, predicate, cancellationToken).ConfigureAwait(false);
 
-            if (first.HasValue)
-            {
-                return first.Value;
-            }
-
-            throw new InvalidOperationException(Strings.NO_ELEMENTS);
+            return first.HasValue ? first.Value : throw new InvalidOperationException(Strings.NO_ELEMENTS);
         }
     }
 }

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

@@ -70,36 +70,21 @@ namespace System.Linq
         {
             var first = await TryGetFirst(source, cancellationToken).ConfigureAwait(false);
 
-            if (first.HasValue)
-            {
-                return first.Value;
-            }
-
-            return default;
+            return first.HasValue ? first.Value : default;
         }
 
         private static async Task<TSource> FirstOrDefaultCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, bool> predicate, CancellationToken cancellationToken)
         {
             var first = await TryGetFirst(source, predicate, cancellationToken).ConfigureAwait(false);
 
-            if (first.HasValue)
-            {
-                return first.Value;
-            }
-
-            return default;
+            return first.HasValue ? first.Value : default;
         }
 
         private static async Task<TSource> FirstOrDefaultCore<TSource>(IAsyncEnumerable<TSource> source, Func<TSource, Task<bool>> predicate, CancellationToken cancellationToken)
         {
             var first = await TryGetFirst(source, predicate, cancellationToken).ConfigureAwait(false);
 
-            if (first.HasValue)
-            {
-                return first.Value;
-            }
-
-            return default;
+            return first.HasValue ? first.Value : default;
         }
 
         private static async Task<Maybe<TSource>> TryGetFirst<TSource>(IAsyncEnumerable<TSource> source, CancellationToken cancellationToken)