Removing extension methods on IAsyncObserver<T>.

AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/Select.cs

@@ -15,7 +15,7 @@ namespace System.Reactive.Linq
             if (selector == null)
                 throw new ArgumentNullException(nameof(selector));
 
-            return Create<R>(observer => source.SubscribeAsync(observer.Select(selector)));
+            return Create<R>(observer => source.SubscribeAsync(AsyncObserver.Select(observer, selector)));
         }
 
         public static IAsyncObservable<R> Select<T, R>(this IAsyncObservable<T> source, Func<T, Task<R>> selector)
@@ -25,7 +25,7 @@ namespace System.Reactive.Linq
             if (selector == null)
                 throw new ArgumentNullException(nameof(selector));
 
-            return Create<R>(observer => source.SubscribeAsync(observer.Select(selector)));
+            return Create<R>(observer => source.SubscribeAsync(AsyncObserver.Select(observer, selector)));
         }
 
         public static IAsyncObservable<R> Select<T, R>(this IAsyncObservable<T> source, Func<T, int, R> selector)
@@ -35,7 +35,7 @@ namespace System.Reactive.Linq
             if (selector == null)
                 throw new ArgumentNullException(nameof(selector));
 
-            return Create<R>(observer => source.SubscribeAsync(observer.Select(selector)));
+            return Create<R>(observer => source.SubscribeAsync(AsyncObserver.Select(observer, selector)));
         }
 
         public static IAsyncObservable<R> Select<T, R>(this IAsyncObservable<T> source, Func<T, int, Task<R>> selector)
@@ -45,13 +45,13 @@ namespace System.Reactive.Linq
             if (selector == null)
                 throw new ArgumentNullException(nameof(selector));
 
-            return Create<R>(observer => source.SubscribeAsync(observer.Select(selector)));
+            return Create<R>(observer => source.SubscribeAsync(AsyncObserver.Select(observer, selector)));
         }
     }
 
     partial class AsyncObserver
     {
-        public static IAsyncObserver<T> Select<T, R>(this IAsyncObserver<R> observer, Func<T, R> selector)
+        public static IAsyncObserver<T> Select<T, R>(IAsyncObserver<R> observer, Func<T, R> selector)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -80,7 +80,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> Select<T, R>(this IAsyncObserver<R> observer, Func<T, Task<R>> selector)
+        public static IAsyncObserver<T> Select<T, R>(IAsyncObserver<R> observer, Func<T, Task<R>> selector)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -109,7 +109,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> Select<T, R>(this IAsyncObserver<R> observer, Func<T, int, R> selector)
+        public static IAsyncObserver<T> Select<T, R>(IAsyncObserver<R> observer, Func<T, int, R> selector)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -140,7 +140,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> Select<T, R>(this IAsyncObserver<R> observer, Func<T, int, Task<R>> selector)
+        public static IAsyncObserver<T> Select<T, R>(IAsyncObserver<R> observer, Func<T, int, Task<R>> selector)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));

AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/Skip.cs

@@ -18,13 +18,13 @@ namespace System.Reactive.Linq
                 return source;
             }
 
-            return Create<T>(observer => source.SubscribeAsync(observer.Skip(count)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.Skip(observer, count)));
         }
     }
 
     partial class AsyncObserver
     {
-        public static IAsyncObserver<T> Skip<T>(this IAsyncObserver<T> observer, int count)
+        public static IAsyncObserver<T> Skip<T>(IAsyncObserver<T> observer, int count)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));

AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/SkipWhile.cs

@@ -15,7 +15,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.SkipWhile(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.SkipWhile(observer, predicate)));
         }
 
         public static IAsyncObservable<T> SkipWhile<T>(this IAsyncObservable<T> source, Func<T, Task<bool>> predicate)
@@ -25,7 +25,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.SkipWhile(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.SkipWhile(observer, predicate)));
         }
 
         public static IAsyncObservable<T> SkipWhile<T>(this IAsyncObservable<T> source, Func<T, int, bool> predicate)
@@ -35,7 +35,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.SkipWhile(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.SkipWhile(observer, predicate)));
         }
 
         public static IAsyncObservable<T> SkipWhile<T>(this IAsyncObservable<T> source, Func<T, int, Task<bool>> predicate)
@@ -45,13 +45,13 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.SkipWhile(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.SkipWhile(observer, predicate)));
         }
     }
 
     partial class AsyncObserver
     {
-        public static IAsyncObserver<T> SkipWhile<T>(this IAsyncObserver<T> observer, Func<T, bool> predicate)
+        public static IAsyncObserver<T> SkipWhile<T>(IAsyncObserver<T> observer, Func<T, bool> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -86,7 +86,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> SkipWhile<T>(this IAsyncObserver<T> observer, Func<T, Task<bool>> predicate)
+        public static IAsyncObserver<T> SkipWhile<T>(IAsyncObserver<T> observer, Func<T, Task<bool>> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -121,7 +121,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> SkipWhile<T>(this IAsyncObserver<T> observer, Func<T, int, bool> predicate)
+        public static IAsyncObserver<T> SkipWhile<T>(IAsyncObserver<T> observer, Func<T, int, bool> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -157,7 +157,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> SkipWhile<T>(this IAsyncObserver<T> observer, Func<T, int, Task<bool>> predicate)
+        public static IAsyncObserver<T> SkipWhile<T>(IAsyncObserver<T> observer, Func<T, int, Task<bool>> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));

AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/Take.cs

@@ -18,13 +18,13 @@ namespace System.Reactive.Linq
                 return Empty<T>();
             }
 
-            return Create<T>(observer => source.SubscribeAsync(observer.Take(count)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.Take(observer, count)));
         }
     }
 
     partial class AsyncObserver
     {
-        public static IAsyncObserver<T> Take<T>(this IAsyncObserver<T> observer, int count)
+        public static IAsyncObserver<T> Take<T>(IAsyncObserver<T> observer, int count)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));

AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/TakeWhile.cs

@@ -15,7 +15,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.TakeWhile(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.TakeWhile(observer, predicate)));
         }
 
         public static IAsyncObservable<T> TakeWhile<T>(this IAsyncObservable<T> source, Func<T, Task<bool>> predicate)
@@ -25,7 +25,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.TakeWhile(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.TakeWhile(observer, predicate)));
         }
 
         public static IAsyncObservable<T> TakeWhile<T>(this IAsyncObservable<T> source, Func<T, int, bool> predicate)
@@ -35,7 +35,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.TakeWhile(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.TakeWhile(observer, predicate)));
         }
 
         public static IAsyncObservable<T> TakeWhile<T>(this IAsyncObservable<T> source, Func<T, int, Task<bool>> predicate)
@@ -45,13 +45,13 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.TakeWhile(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.TakeWhile(observer, predicate)));
         }
     }
 
     partial class AsyncObserver
     {
-        public static IAsyncObserver<T> TakeWhile<T>(this IAsyncObserver<T> observer, Func<T, bool> predicate)
+        public static IAsyncObserver<T> TakeWhile<T>(IAsyncObserver<T> observer, Func<T, bool> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -87,7 +87,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> TakeWhile<T>(this IAsyncObserver<T> observer, Func<T, Task<bool>> predicate)
+        public static IAsyncObserver<T> TakeWhile<T>(IAsyncObserver<T> observer, Func<T, Task<bool>> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -123,7 +123,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> TakeWhile<T>(this IAsyncObserver<T> observer, Func<T, int, bool> predicate)
+        public static IAsyncObserver<T> TakeWhile<T>(IAsyncObserver<T> observer, Func<T, int, bool> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -161,7 +161,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> TakeWhile<T>(this IAsyncObserver<T> observer, Func<T, int, Task<bool>> predicate)
+        public static IAsyncObserver<T> TakeWhile<T>(IAsyncObserver<T> observer, Func<T, int, Task<bool>> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));

AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/Where.cs

@@ -15,7 +15,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.Where(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.Where(observer, predicate)));
         }
 
         public static IAsyncObservable<T> Where<T>(this IAsyncObservable<T> source, Func<T, Task<bool>> predicate)
@@ -25,7 +25,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.Where(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.Where(observer, predicate)));
         }
 
         public static IAsyncObservable<T> Where<T>(this IAsyncObservable<T> source, Func<T, int, bool> predicate)
@@ -35,7 +35,7 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.Where(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.Where(observer, predicate)));
         }
 
         public static IAsyncObservable<T> Where<T>(this IAsyncObservable<T> source, Func<T, int, Task<bool>> predicate)
@@ -45,13 +45,13 @@ namespace System.Reactive.Linq
             if (predicate == null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return Create<T>(observer => source.SubscribeAsync(observer.Where(predicate)));
+            return Create<T>(observer => source.SubscribeAsync(AsyncObserver.Where(observer, predicate)));
         }
     }
 
     partial class AsyncObserver
     {
-        public static IAsyncObserver<T> Where<T>(this IAsyncObserver<T> observer, Func<T, bool> predicate)
+        public static IAsyncObserver<T> Where<T>(IAsyncObserver<T> observer, Func<T, bool> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -83,7 +83,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> Where<T>(this IAsyncObserver<T> observer, Func<T, Task<bool>> predicate)
+        public static IAsyncObserver<T> Where<T>(IAsyncObserver<T> observer, Func<T, Task<bool>> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -115,7 +115,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> Where<T>(this IAsyncObserver<T> observer, Func<T, int, bool> predicate)
+        public static IAsyncObserver<T> Where<T>(IAsyncObserver<T> observer, Func<T, int, bool> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
@@ -149,7 +149,7 @@ namespace System.Reactive.Linq
             );
         }
 
-        public static IAsyncObserver<T> Where<T>(this IAsyncObserver<T> observer, Func<T, int, Task<bool>> predicate)
+        public static IAsyncObserver<T> Where<T>(IAsyncObserver<T> observer, Func<T, int, Task<bool>> predicate)
         {
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));