Browse Source

Move Create and AsAsyncEnumerable.

Bart De Smet 7 years ago
parent
commit
6a3dfda574

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

@@ -117,6 +117,5 @@ namespace System.Linq
                 }
             }
         }
-
     }
 }

+ 20 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/AsyncEnumerable.cs

@@ -8,8 +8,26 @@ namespace System.Linq
 {
     public static partial class AsyncEnumerable
     {
-        // NB: Synchronous LINQ to Objects doesn't hide the implementation of the source either.
+        public static IAsyncEnumerable<T> CreateEnumerable<T>(Func<CancellationToken, IAsyncEnumerator<T>> getEnumerator)
+        {
+            if (getEnumerator == null)
+                throw Error.ArgumentNull(nameof(getEnumerator));
 
-        public static IAsyncEnumerable<TSource> AsAsyncEnumerable<TSource>(this IAsyncEnumerable<TSource> source) => source;
+            return new AnonymousAsyncEnumerable<T>(getEnumerator);
+        }
+
+        private sealed class AnonymousAsyncEnumerable<T> : IAsyncEnumerable<T>
+        {
+            private readonly Func<CancellationToken, IAsyncEnumerator<T>> _getEnumerator;
+
+            public AnonymousAsyncEnumerable(Func<CancellationToken, IAsyncEnumerator<T>> getEnumerator)
+            {
+                Debug.Assert(getEnumerator != null);
+
+                _getEnumerator = getEnumerator;
+            }
+
+            public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken) => _getEnumerator(cancellationToken);
+        }
     }
 }

+ 15 - 0
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/AsAsyncEnumerable.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information. 
+
+using System.Collections.Generic;
+
+namespace System.Linq
+{
+    public static partial class AsyncEnumerable
+    {
+        // NB: Synchronous LINQ to Objects doesn't hide the implementation of the source either.
+
+        public static IAsyncEnumerable<TSource> AsAsyncEnumerable<TSource>(this IAsyncEnumerable<TSource> source) => source;
+    }
+}

+ 0 - 35
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Create.cs

@@ -1,35 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information. 
-
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-
-namespace System.Linq
-{
-    public static partial class AsyncEnumerable
-    {
-        public static IAsyncEnumerable<T> CreateEnumerable<T>(Func<CancellationToken, IAsyncEnumerator<T>> getEnumerator)
-        {
-            if (getEnumerator == null)
-                throw Error.ArgumentNull(nameof(getEnumerator));
-
-            return new AnonymousAsyncEnumerable<T>(getEnumerator);
-        }
-
-        private sealed class AnonymousAsyncEnumerable<T> : IAsyncEnumerable<T>
-        {
-            private readonly Func<CancellationToken, IAsyncEnumerator<T>> _getEnumerator;
-
-            public AnonymousAsyncEnumerable(Func<CancellationToken, IAsyncEnumerator<T>> getEnumerator)
-            {
-                Debug.Assert(getEnumerator != null);
-
-                _getEnumerator = getEnumerator;
-            }
-
-            public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken) => _getEnumerator(cancellationToken);
-        }
-    }
-}