Add empty AnonymousDisposable initializer

MobiusCore/Source/Disposables/AnonymousDisposable.swift

@@ -12,13 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Foundation
-
 /// The `AnonymousDisposable` class implements a `Disposable` type that disposes of resources via a closure.
-public final class AnonymousDisposable: MobiusCore.Disposable {
-    /// The closure which disposes of the object.
-    private var disposer: (() -> Void)?
-    private let lock = DispatchQueue(label: "Mobius.AnonymousDisposable")
+public final class AnonymousDisposable: Disposable {
+    private let disposable: Synchronized<(() -> Void)?>?
 
     /// Creates a type-erased `AnonymousDisposable` that wraps the given instance.
     public convenience init<Disposable: MobiusCore.Disposable>(_ base: Disposable) {
@@ -35,17 +31,17 @@ public final class AnonymousDisposable: MobiusCore.Disposable {
     ///
     /// - Parameter disposer: The code which disposes of the resources.
     public init(disposer: @escaping () -> Void) {
-        self.disposer = disposer
+        disposable = Synchronized(value: disposer)
     }
 
-    public func dispose() {
-        var disposer: (() -> Void)?
+    public init() {
+        disposable = nil
+    }
 
-        lock.sync {
-            disposer = self.disposer
-            self.disposer = nil
+    public func dispose() {
+        disposable?.mutate { disposer in
+            disposer?()
+            disposer = nil
         }
-
-        disposer?()
     }
 }

MobiusCore/Source/EffectHandlers/EffectRouterDSL.swift

@@ -42,7 +42,7 @@ public extension _PartialEffectRouter {
         return to { parameters, callback in
             fireAndForget(parameters)
             callback.end()
-            return EmptyDisposable()
+            return AnonymousDisposable()
         }
     }
 
@@ -58,7 +58,7 @@ public extension _PartialEffectRouter {
                 callback.send(event)
             }
             callback.end()
-            return EmptyDisposable()
+            return AnonymousDisposable()
         }
     }
 }

MobiusCore/Source/EventSources/CompositeEventSourceBuilder.swift

@@ -40,7 +40,7 @@ public struct CompositeEventSourceBuilder<Event> {
     public func build() -> AnyEventSource<Event> {
         switch eventSources.count {
         case 0:
-            return AnyEventSource { _ in EmptyDisposable() }
+            return AnyEventSource { _ in AnonymousDisposable() }
         case 1:
             return eventSources[0]
         default:

MobiusCore/Source/Mobius.swift

@@ -74,7 +74,7 @@ public enum Mobius {
         return Builder(
             update: update,
             effectHandler: effectHandler,
-            eventSource: AnyEventSource({ _ in EmptyDisposable() }),
+            eventSource: AnyEventSource({ _ in AnonymousDisposable() }),
             eventConsumerTransformer: { $0 },
             logger: AnyMobiusLogger(NoopLogger())
         )

MobiusCore/Test/EffectHandlers/EffectHandlerTests.swift

@@ -83,5 +83,5 @@ private func handleEffect(effect: Effect, callback: EffectCallback<Event>) -> Di
         callback.send(.eventForEffect1)
     }
     callback.end()
-    return EmptyDisposable()
+    return AnonymousDisposable()
 }

MobiusCore/Test/EffectHandlers/EffectRouterDSLTests.swift

@@ -167,7 +167,7 @@ class EffectRouterDSLTests: QuickSpec {
                         expect(effect).to(equal(.effect1))
                         callback.send(.eventForEffect1)
                         callback.end()
-                        return EmptyDisposable()
+                        return AnonymousDisposable()
                     }
                     .asConnectable
                     .connect { events.append($0) }

MobiusCore/Test/EffectHandlers/EffectRouterTests.swift

@@ -98,7 +98,7 @@ class EffectRouterTests: QuickSpec {
                         .to { _, callback in
                             callback.send(.eventForEffect2)
                             callback.end()
-                            return EmptyDisposable()
+                            return AnonymousDisposable()
                         }
                     .asConnectable
 
@@ -119,7 +119,7 @@ class EffectRouterTests: QuickSpec {
 
             beforeEach {
                 let handler = AnyEffectHandler<Effect, Event> { _, _ in
-                    EmptyDisposable()
+                    AnonymousDisposable()
                 }
                 let invalidRouter = EffectRouter<Effect, Event>()
                     .routeEffects(equalTo: .multipleHandlersForThisEffect).to(handler)
@@ -163,7 +163,7 @@ class EffectRouterTests: QuickSpec {
                     .routeEffects(equalTo: .effect2)
                         .to { _, callback in
                             callback.end()
-                            return EmptyDisposable()
+                            return AnonymousDisposable()
                         }
                     .asConnectable
 

MobiusCore/Test/NonReentrancyTests.swift

@@ -67,7 +67,7 @@ class NonReentrancyTests: QuickSpec {
 
                 let testEffectHandler = AnyEffectHandler<Effect, Event> {
                     handleEffect($0, $1)
-                    return EmptyDisposable()
+                    return AnonymousDisposable()
                 }
 
                 let effectConnectable = EffectRouter<Effect, Event>()

MobiusExtras/Test/EventSource+ExtensionsTests.swift

@@ -27,7 +27,7 @@ class EventSourceExtensionsTests: QuickSpec {
             beforeEach {
                 intEventSource = AnyEventSource { (consumer: @escaping (Int) -> Void) in
                     subscribedIntConsumer = consumer
-                    return EmptyDisposable()
+                    return AnonymousDisposable()
                 }
             }