Minor optimizations to collection flattening

nlkl · Oct 16, 2017 · 6442429 · 6442429
1 parent fd60f90
commit 6442429
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/src/Optional/Collections/OptionCollectionExtensions.cs b/src/Optional/Collections/OptionCollectionExtensions.cs
@@ -18,7 +18,14 @@ public static class OptionCollectionExtensions
         public static IEnumerable<T> Values<T>(this IEnumerable<Option<T>> source)
         {
             if (source == null) throw new ArgumentNullException(nameof(source));
-            return source.SelectMany(option => option.ToEnumerable());
+
+            foreach (var option in source)
+            {
+                if (option.HasValue)
+                {
+                    yield return option.Value;
+                }
+            }
         }
 
         /// <summary>
@@ -30,7 +37,14 @@ public static IEnumerable<T> Values<T>(this IEnumerable<Option<T>> source)
         public static IEnumerable<T> Values<T, TException>(this IEnumerable<Option<T, TException>> source)
         {
             if (source == null) throw new ArgumentNullException(nameof(source));
-            return source.SelectMany(option => option.ToEnumerable());
+
+            foreach (var option in source)
+            {
+                if (option.HasValue)
+                {
+                    yield return option.Value;
+                }
+            }
         }
 
         /// <summary>
@@ -43,15 +57,13 @@ public static IEnumerable<TException> Exceptions<T, TException>(this IEnumerable
         {
             if (source == null) throw new ArgumentNullException(nameof(source));
 
-            IEnumerable<TException> ExceptionToEnumerable(Option<T, TException> option)
+            foreach (var option in source)
             {
                 if (!option.HasValue)
                 {
                     yield return option.Exception;
                 }
             }
-
-            return source.SelectMany(ExceptionToEnumerable);
         }
 
         /// <summary>