disposable v0.3.0

GoodHatsLLC · Dec 22, 2022 · b4596e6 · b4596e6
1 parent 5ac9aae
commit b4596e6
Show file tree

Hide file tree

Showing 30 changed files with 108 additions and 140 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/GoodHatsLLC/Disposable.git",
       "state" : {
-        "revision" : "2280c49e0b09b3ecd003a7c8471a42c30d66629f",
-        "version" : "0.1.0"
+        "revision" : "65399859f05b1c4750b4df8c9d9f1833cf7b520c",
+        "version" : "0.3.0"
       }
     }
   ],

diff --git a/Package.swift b/Package.swift
@@ -11,29 +11,24 @@ let package = Package(
             name: "Emitter",
             targets: [
                 "Emitter",
-                "EmitterInterface",
             ]
         ),
-        .library(
-            name: "EmitterInterface",
-            targets: ["EmitterInterface"]
-        ),
     ],
     dependencies: [
-        .package(url: "https://github.com/GoodHatsLLC/Disposable.git", from: "0.1.0"),
+        .package(url: "https://github.com/GoodHatsLLC/Disposable.git", from: "0.3.0"),
     ],
     targets: [
         .target(
             name: "Emitter",
             dependencies: [
-                "Disposable",
                 "EmitterInterface",
+                "Disposable",
             ]
         ),
         .target(
             name: "EmitterInterface",
             dependencies: [
-                .product(name: "DisposableInterface", package: "Disposable"),
+                "Disposable",
             ]
         ),
         .testTarget(

diff --git a/Sources/Emitter/Operators/AsyncValues.swift b/Sources/Emitter/Operators/AsyncValues.swift
@@ -19,7 +19,7 @@ extension Emitter {
 
             continuation.onTermination = { _ in
                 Task {
-                    await disposable.dispose()
+                    disposable.dispose()
                 }
             }
         }

diff --git a/Sources/Emitter/Operators/CombineLatest.swift b/Sources/Emitter/Operators/CombineLatest.swift
@@ -12,7 +12,7 @@ extension Emitter {
 // MARK: - Emitters.CombineLatest
 
 extension Emitters {
-    @MainActor
+
     public struct CombineLatest<UpstreamA: Emitter, UpstreamB: Emitter>: Emitter
         where UpstreamA.Output: Sendable, UpstreamB.Output: Sendable
     {
@@ -32,7 +32,7 @@ extension Emitters {
         public func subscribe<S: Subscriber>(_ subscriber: S)
             -> AnyDisposable where S.Value == Output
         {
-            let stage = DisposalStage()
+            let stage = DisposableStage()
             let sub = Sub(downstream: subscriber)
             let mapA = Proxy(downstream: sub, joinInit: JoinSubInput.a)
             let mapB = Proxy(downstream: sub, joinInit: JoinSubInput.b)
@@ -51,7 +51,6 @@ extension Emitters {
             case b(OutputB)
         }
 
-        @MainActor
         private final class Sub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output
         {
@@ -89,7 +88,6 @@ extension Emitters {
 
         }
 
-        @MainActor
         private struct Proxy<UpstreamValue, Downstream: Subscriber>: Subscriber where Downstream.Value == JoinSubInput {
 
             fileprivate init(

diff --git a/Sources/Emitter/Operators/CompactMap.swift b/Sources/Emitter/Operators/CompactMap.swift
@@ -3,7 +3,7 @@ import EmitterInterface
 
 extension Emitter {
     public func compactMap<NewOutput: Sendable>(
-        transformer: @escaping @MainActor (Output) -> NewOutput?
+        transformer: @escaping (Output) -> NewOutput?
     ) -> some Emitter<NewOutput> {
         Emitters.CompactMap<Self, NewOutput>(upstream: self, transformer: transformer)
     }
@@ -14,18 +14,17 @@ extension Emitter {
 extension Emitters {
     // MARK: - CompactMap
 
-    @MainActor
     public struct CompactMap<Upstream: Emitter, Output: Sendable>: Emitter {
 
         init(
             upstream: Upstream,
-            transformer: @escaping @MainActor (Upstream.Output) -> Output?
+            transformer: @escaping (Upstream.Output) -> Output?
         ) {
             self.transformer = transformer
             self.upstream = upstream
         }
 
-        public let transformer: @MainActor (Upstream.Output) -> Output?
+        public let transformer: (Upstream.Output) -> Output?
         public let upstream: Upstream
 
         public func subscribe<S: Subscriber>(_ subscriber: S)
@@ -35,11 +34,11 @@ extension Emitters {
             upstream.subscribe(Sub<S>(downstream: subscriber, transformer: transformer))
         }
 
-        @MainActor
+
         private struct Sub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output
         {
-            fileprivate init(downstream: Downstream, transformer: @escaping @MainActor (Upstream.Output) -> Output?) {
+            fileprivate init(downstream: Downstream, transformer: @escaping (Upstream.Output) -> Output?) {
                 self.downstream = downstream
                 self.transformer = transformer
             }
@@ -62,7 +61,7 @@ extension Emitters {
             }
 
             private let downstream: Downstream
-            private let transformer: @MainActor (Upstream.Output) -> Output?
+            private let transformer: (Upstream.Output) -> Output?
 
         }
 

diff --git a/Sources/Emitter/Operators/Filter.swift b/Sources/Emitter/Operators/Filter.swift
@@ -3,7 +3,7 @@ import EmitterInterface
 
 extension Emitter {
     public func filter(
-        _ evaluator: @escaping @MainActor (Output) -> Bool
+        _ evaluator: @escaping (Output) -> Bool
     ) -> some Emitter<Output> {
         Emitters.Filter(upstream: self, evaluator: evaluator)
     }
@@ -14,21 +14,19 @@ extension Emitter {
 extension Emitters {
     // MARK: - Filter
 
-    @MainActor
     public struct Filter<Upstream: Emitter, Output: Sendable>: Emitter
         where Upstream.Output == Output
     {
 
-        @MainActor
         public init(
             upstream: Upstream,
-            evaluator: @escaping @MainActor (Output) -> Bool
+            evaluator: @escaping (Output) -> Bool
         ) where Upstream.Output == Output {
             self.evaluator = evaluator
             self.upstream = upstream
         }
 
-        public let evaluator: @MainActor (Output) -> Bool
+        public let evaluator: (Output) -> Bool
         public let upstream: Upstream
 
         public func subscribe<S: Subscriber>(_ subscriber: S)
@@ -41,7 +39,7 @@ extension Emitters {
         private struct Sub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output
         {
-            fileprivate init(downstream: Downstream, evaluator: @escaping @MainActor (Output) -> Bool) {
+            fileprivate init(downstream: Downstream, evaluator: @escaping (Output) -> Bool) {
                 self.downstream = downstream
                 self.evaluator = evaluator
             }
@@ -64,7 +62,7 @@ extension Emitters {
             }
 
             private let downstream: Downstream
-            private let evaluator: @MainActor (Output)
+            private let evaluator: (Output)
                 -> Bool
 
         }

diff --git a/Sources/Emitter/Operators/FlatMapLatest.swift b/Sources/Emitter/Operators/FlatMapLatest.swift
@@ -3,7 +3,7 @@ import EmitterInterface
 
 extension Emitter {
     public func flatMapLatest<NewOutput: Sendable>(
-        producer: @escaping @MainActor (Output) -> some Emitter<NewOutput>
+        producer: @escaping (Output) -> some Emitter<NewOutput>
     ) -> some Emitter<NewOutput> {
         Emitters.FlatMapLatest(upstream: self, producer: producer)
     }
@@ -14,18 +14,17 @@ extension Emitter {
 extension Emitters {
     // MARK: - FlatMapLatest
 
-    @MainActor
     public struct FlatMapLatest<Upstream: Emitter, Output: Sendable>: Emitter {
 
         public init(
             upstream: Upstream,
-            producer: @escaping @MainActor (Upstream.Output) -> some Emitter<Output>
+            producer: @escaping (Upstream.Output) -> some Emitter<Output>
         ) where Upstream.Output == Upstream.Output {
             self.producer = { producer($0).erase() }
             self.upstream = upstream
         }
 
-        public let producer: @MainActor (Upstream.Output) -> AnyEmitter<Output>
+        public let producer: (Upstream.Output) -> AnyEmitter<Output>
         public let upstream: Upstream
 
         public func subscribe<S: Subscriber>(_ subscriber: S)
@@ -41,15 +40,15 @@ extension Emitters {
             )
         }
 
-        @MainActor
+
         private final class Sub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output
         {
 
             fileprivate init(
                 downstream: Downstream,
                 upstream: Upstream,
-                producer: @escaping @MainActor (Upstream.Output) -> AnyEmitter<Output>
+                producer: @escaping (Upstream.Output) -> AnyEmitter<Output>
             ) {
                 self.downstream = downstream
                 self.producer = producer
@@ -71,7 +70,7 @@ extension Emitters {
                 }
             }
 
-            @MainActor
+
             private struct InnerSub<Downstream: Subscriber>: Subscriber
                 where Downstream.Value == Output
             {
@@ -96,7 +95,7 @@ extension Emitters {
             }
 
             private let downstream: Downstream
-            private let producer: @MainActor (Upstream.Output) -> AnyEmitter<Output>
+            private let producer: (Upstream.Output) -> AnyEmitter<Output>
 
             private let upstream: Upstream
             private var current: InnerSub<Downstream>?

diff --git a/Sources/Emitter/Operators/Map.swift b/Sources/Emitter/Operators/Map.swift
@@ -3,7 +3,7 @@ import EmitterInterface
 
 extension Emitter {
     public func map<NewOutput: Sendable>(
-        _ transformer: @escaping @MainActor (Output) -> NewOutput
+        _ transformer: @escaping (Output) -> NewOutput
     ) -> some Emitter<NewOutput> {
         Emitters.Map(upstream: self, transformer: transformer)
     }
@@ -14,18 +14,17 @@ extension Emitter {
 extension Emitters {
     // MARK: - Map
 
-    @MainActor
     public struct Map<Upstream: Emitter, Output: Sendable>: Emitter {
 
         public init(
             upstream: Upstream,
-            transformer: @escaping @MainActor (Upstream.Output) -> Output
+            transformer: @escaping (Upstream.Output) -> Output
         ) {
             self.transformer = transformer
             self.upstream = upstream
         }
 
-        public let transformer: @MainActor (Upstream.Output) -> Output
+        public let transformer: (Upstream.Output) -> Output
         public let upstream: Upstream
 
         public func subscribe<S: Subscriber>(_ subscriber: S) -> AnyDisposable
@@ -39,14 +38,14 @@ extension Emitters {
             )
         }
 
-        @MainActor
+
         private struct Sub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output
         {
 
             fileprivate init(
                 downstream: Downstream,
-                transformer: @escaping @MainActor (Upstream.Output) -> Output
+                transformer: @escaping (Upstream.Output) -> Output
             ) {
                 self.downstream = downstream
                 self.transformer = transformer
@@ -66,7 +65,7 @@ extension Emitters {
             }
 
             private let downstream: Downstream
-            private let transformer: @MainActor (Upstream.Output)
+            private let transformer: (Upstream.Output)
                 -> Output
 
         }

diff --git a/Sources/Emitter/Operators/Merge.swift b/Sources/Emitter/Operators/Merge.swift
@@ -14,7 +14,6 @@ extension Emitter {
 extension Emitters {
     // MARK: - Merge
 
-    @MainActor
     public struct Merge<UpstreamA: Emitter, UpstreamB: Emitter, Output: Sendable>: Emitter
         where UpstreamA.Output == Output, UpstreamB.Output == Output
     {
@@ -43,7 +42,7 @@ extension Emitters {
                 )
         }
 
-        @MainActor
+
         private final class IntermediateSub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output
         {

diff --git a/Sources/Emitter/Operators/Print.swift b/Sources/Emitter/Operators/Print.swift
@@ -38,7 +38,6 @@ extension Emitter {
 extension Emitters {
     // MARK: - Print
 
-    @MainActor
     public struct Print<Upstream: Emitter, Output: Sendable>: Emitter
         where Upstream.Output == Output
     {
@@ -96,7 +95,7 @@ extension Emitters {
             }
         }
 
-        @MainActor
+
         private struct Sub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output
         {

diff --git a/Sources/Emitter/Operators/RemoveDuplicates.swift b/Sources/Emitter/Operators/RemoveDuplicates.swift
@@ -14,7 +14,6 @@ extension Emitter {
 extension Emitters {
     // MARK: - RemoveDuplicates
 
-    @MainActor
     public struct RemoveDuplicates<Upstream: Emitter, Output: Sendable>: Emitter where Output: Equatable,
         Upstream.Output == Output
     {
@@ -32,7 +31,7 @@ extension Emitters {
             upstream.subscribe(Sub<S>(downstream: subscriber))
         }
 
-        @MainActor
+
         private final class Sub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output, Output: Equatable
         {

diff --git a/Sources/Emitter/Operators/Union.swift b/Sources/Emitter/Operators/Union.swift
@@ -15,7 +15,6 @@ extension Emitter {
 
 extension Emitters {
 
-    @MainActor
     public struct Union<UpstreamA: Emitter, UpstreamB: Emitter>: Emitter
         where UpstreamA.Output: EmitterInterface.Union.Unionable, UpstreamB.Output: EmitterInterface.Union.Unionable
     {
@@ -46,7 +45,7 @@ extension Emitters {
                 )
         }
 
-        @MainActor
+
         private final class IntermediateSub<Downstream: Subscriber>: Subscriber
             where Downstream.Value == Output
         {
@@ -102,7 +101,6 @@ extension Emitters {
 
         }
 
-        @MainActor
         private struct Proxy<UpstreamValue, Downstream: Subscriber>: Subscriber where Downstream.Value == Output {
 
             fileprivate init(

diff --git a/Sources/Emitter/Subjects/PublishSubject.swift b/Sources/Emitter/Subjects/PublishSubject.swift
@@ -4,7 +4,6 @@ import Foundation
 
 // MARK: - PublishSubject
 
-@MainActor
 public final class PublishSubject<Value: Sendable>: Emitter, Source {
 
     public init() {}