From 251c3818602b660df6ae3646c0f643534834750c Mon Sep 17 00:00:00 2001
From: Daniel Weber <dw@exram.de>
Date: Thu, 5 Jul 2018 19:37:21 +0200
Subject: [PATCH] Inline CancellationDisposable in SelectMany.

---
 .../System.Reactive/Linq/Observable/SelectMany.cs    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/SelectMany.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/SelectMany.cs
index e5c07d7ee7..b400ef5063 100644
--- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/SelectMany.cs
+++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/SelectMany.cs
@@ -534,7 +534,7 @@ public TaskSelector(IObservable<TSource> source, Func<TSource, CancellationToken
             internal sealed class _ : Sink<TSource, TResult>
             {
                 private readonly object _gate = new object();
-                private readonly CancellationDisposable _cancel = new CancellationDisposable();
+                private readonly CancellationTokenSource _cancel = new CancellationTokenSource();
 
                 private readonly Func<TSource, CancellationToken, Task<TCollection>> _collectionSelector;
                 private readonly Func<TSource, TCollection, TResult> _resultSelector;
@@ -559,7 +559,7 @@ protected override void Dispose(bool disposing)
                 {
                     if (disposing)
                     {
-                        _cancel.Dispose();
+                        _cancel.Cancel();
                     }
                     base.Dispose(disposing);
                 }
@@ -639,7 +639,7 @@ private void OnCompletedTask(TSource value, Task<TCollection> task)
                         break;
                         case TaskStatus.Canceled:
                         {
-                            if (!_cancel.IsDisposed)
+                            if (!_cancel.IsCancellationRequested)
                             {
                                 lock (_gate)
                                 {
@@ -692,7 +692,7 @@ public TaskSelectorIndexed(IObservable<TSource> source, Func<TSource, int, Cance
             internal sealed class _ : Sink<TSource, TResult>
             {
                 private readonly object _gate = new object();
-                private readonly CancellationDisposable _cancel = new CancellationDisposable();
+                private readonly CancellationTokenSource _cancel = new CancellationTokenSource();
 
                 private readonly Func<TSource, int, CancellationToken, Task<TCollection>> _collectionSelector;
                 private readonly Func<TSource, int, TCollection, TResult> _resultSelector;
@@ -718,7 +718,7 @@ protected override void Dispose(bool disposing)
                 {
                     if (disposing)
                     {
-                        _cancel.Dispose();
+                        _cancel.Cancel();
                     }
                     base.Dispose(disposing);
                 }
@@ -800,7 +800,7 @@ private void OnCompletedTask(TSource value, int index, Task<TCollection> task)
                         break;
                         case TaskStatus.Canceled:
                         {
-                            if (!_cancel.IsDisposed)
+                            if (!_cancel.IsCancellationRequested)
                             {
                                 lock (_gate)
                                 {