浏览代码

Remove CreateEnumerator.

Bart De Smet 7 年之前
父节点
当前提交
7184e4f28a

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

@@ -18,7 +18,7 @@ namespace System.Linq
             //         seem correct either, given that we return a *cold* sequence.
             //
 
-            return AsyncEnumerable.CreateEnumerable(_ => AsyncEnumerable.CreateEnumerator<TValue>(() => TaskExt.Never, current: null, dispose: null));
+            return AsyncEnumerable.CreateEnumerable(_ => AsyncEnumerator.Create<TValue>(() => TaskExt.Never, current: null, dispose: null));
         }
     }
 }

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

@@ -27,7 +27,7 @@ namespace System.Linq
             //
 
             return AsyncEnumerable.CreateEnumerable(
-                _ => AsyncEnumerable.CreateEnumerator<TValue>(
+                _ => AsyncEnumerator.Create<TValue>(
                     () => moveNextThrows,
                     current: null,
                     dispose: null)

+ 1 - 1
Ix.NET/Source/System.Linq.Async.Tests/System/Linq/AsyncEnumerableTests.cs

@@ -79,7 +79,7 @@ namespace Tests
 #endif
 
             return AsyncEnumerable.CreateEnumerable(
-                _ => AsyncEnumerable.CreateEnumerator<TValue>(
+                _ => AsyncEnumerator.Create<TValue>(
                     () => moveNextThrows,
                     current: null,
                     dispose: null)

+ 2 - 2
Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/CreateEnumerator.cs

@@ -15,13 +15,13 @@ namespace Tests
         [Fact]
         public void CreateEnumerator_Null()
         {
-            Assert.Throws<ArgumentNullException>(() => AsyncEnumerable.CreateEnumerator(default, () => 3, () => new ValueTask()));
+            Assert.Throws<ArgumentNullException>(() => AsyncEnumerator.Create(default, () => 3, () => new ValueTask()));
         }
 
         [Fact]
         public void CreateEnumerator_Throws()
         {
-            var iter = AsyncEnumerable.CreateEnumerator(() => new ValueTask<bool>(false), () => 3, () => new ValueTask());
+            var iter = AsyncEnumerator.Create(() => new ValueTask<bool>(false), () => 3, () => new ValueTask());
 
             var enu = (IAsyncEnumerable<int>)iter;
 

+ 3 - 3
Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/ToObservable.cs

@@ -142,7 +142,7 @@ namespace Tests
             var evt = new ManualResetEvent(false);
 
             var ae = AsyncEnumerable.CreateEnumerable(
-                _ => AsyncEnumerable.CreateEnumerator<int>(
+                _ => AsyncEnumerator.Create<int>(
                     () => new ValueTask<bool>(false),
                     () => { throw new InvalidOperationException(); },
                     () => { evt.Set(); return default; }));
@@ -176,7 +176,7 @@ namespace Tests
             var subscriptionAssignedTcs = new TaskCompletionSource<object>();
 
             var ae = AsyncEnumerable.CreateEnumerable(
-                _ => AsyncEnumerable.CreateEnumerator(
+                _ => AsyncEnumerator.Create(
                     async () =>
                     {
                         await subscriptionAssignedTcs.Task;
@@ -222,7 +222,7 @@ namespace Tests
             var subscriptionAssignedTcs = new TaskCompletionSource<object>();
 
             var ae = AsyncEnumerable.CreateEnumerable(
-                _ => AsyncEnumerable.CreateEnumerator(
+                _ => AsyncEnumerator.Create(
                     async () =>
                     {
                         await subscriptionAssignedTcs.Task;

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

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

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

@@ -19,16 +19,6 @@ namespace System.Linq
             return new AnonymousAsyncEnumerable<T>(getEnumerator);
         }
 
-        public static IAsyncEnumerator<T> CreateEnumerator<T>(Func<ValueTask<bool>> moveNext, Func<T> current, Func<ValueTask> dispose)
-        {
-            return AsyncEnumerator.Create(moveNext, current, dispose);
-        }
-
-        private static IAsyncEnumerator<T> CreateEnumerator<T>(Func<TaskCompletionSource<bool>, ValueTask<bool>> moveNext, Func<T> current, Func<ValueTask> dispose)
-        {
-            return AsyncEnumerator.Create(moveNext, current, dispose);
-        }
-
         private sealed class AnonymousAsyncEnumerable<T> : IAsyncEnumerable<T>
         {
             private readonly Func<CancellationToken, IAsyncEnumerator<T>> _getEnumerator;

+ 2 - 2
Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ToAsyncEnumerable.cs

@@ -38,7 +38,7 @@ namespace System.Linq
                     var called = 0;
 
                     var value = default(TSource);
-                    return CreateEnumerator(
+                    return AsyncEnumerator.Create(
                         async () =>
                         {
                             if (Interlocked.CompareExchange(ref called, 1, 0) == 0)
@@ -69,7 +69,7 @@ namespace System.Linq
 
                     var ctr = ct.Register(subscription.Dispose);
 
-                    return CreateEnumerator(
+                    return AsyncEnumerator.Create(
                         tcs =>
                         {
                             var hasValue = false;