Use stateful AnonymousDisposable where appropriate. (#651)

Author: danielcweber

Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEvent.cs

@@ -276,19 +276,23 @@ public IDisposable Connect(IObserver<TArgs> observer)
                         }
                     }
 
-                    return Disposable.Create(() =>
-                    {
-                        connection.Dispose();
-
-                        lock (_parent._gate)
+                    return Disposable.Create(
+                        (this, _parent, connection),
+                        tuple =>
                         {
-                            if (--_count == 0)
+                            var (@this, closureParent, closureConnection) = tuple;
+
+                            closureConnection.Dispose();
+
+                            lock (closureParent._gate)
                             {
-                                _parent._scheduler.ScheduleAction(_removeHandler, handler => handler.Dispose());
-                                _parent._session = null;
+                                if (--@this._count == 0)
+                                {
+                                    closureParent._scheduler.ScheduleAction(@this._removeHandler, handler => handler.Dispose());
+                                    closureParent._session = null;
+                                }
                             }
-                        }
-                    });
+                        });
                 }
 
             }
@@ -362,7 +366,9 @@ public ClassicEventProducer(Action<TDelegate> addHandler, Action<TDelegate> remo
         protected override IDisposable AddHandler(TDelegate handler)
         {
             _addHandler(handler);
-            return Disposable.Create(() => _removeHandler(handler));
+            return Disposable.Create(
+                (_removeHandler, handler),
+                tuple => tuple._removeHandler(tuple.handler));
         }
     }
 }

Rx.NET/Source/src/System.Reactive/Linq/Observable/RefCount.cs

@@ -130,32 +130,36 @@ public void Run(Lazy parent)
                         }
                     }
 
-                    SetUpstream(Disposable.Create(() =>
-                    {
-                        subscription.Dispose();
-
-                        lock (parent._gate)
+                    SetUpstream(Disposable.Create(
+                        (parent, subscription),
+                        tuple =>
                         {
-                            if (--parent._count == 0)
-                            {
-                                var cancelable = (SingleAssignmentDisposable)Volatile.Read(ref parent._serial);
+                            var (closureParent, closureSubscription) = tuple;
+
+                            closureSubscription.Dispose();
 
-                                cancelable.Disposable = parent._scheduler.Schedule(cancelable, parent._disconnectTime, (self, state) =>
+                            lock (closureParent._gate)
+                            {
+                                if (--closureParent._count == 0)
                                 {
-                                    lock (parent._gate)
+                                    var cancelable = (SingleAssignmentDisposable)Volatile.Read(ref closureParent._serial);
+
+                                    cancelable.Disposable = closureParent._scheduler.Schedule((cancelable, closureParent), closureParent._disconnectTime, (self, tuple2) =>
                                     {
-                                        if (object.ReferenceEquals(Volatile.Read(ref parent._serial), state))
+                                        lock (tuple2.closureParent._gate)
                                         {
-                                            parent._connectableSubscription.Dispose();
-                                            parent._connectableSubscription = null;
+                                            if (object.ReferenceEquals(Volatile.Read(ref tuple2.closureParent._serial), tuple2.cancelable))
+                                            {
+                                                tuple2.closureParent._connectableSubscription.Dispose();
+                                                tuple2.closureParent._connectableSubscription = null;
+                                            }
                                         }
-                                    }
 
-                                    return Disposable.Empty;
-                                });
+                                        return Disposable.Empty;
+                                    });
+                                }
                             }
-                        }
-                    }));
+                        }));
                 }
             }
         }