Subscribers reentrancy bugs fix (#211)

Co-authored-by: VassilyChi <chijie@bytedance.com>
OpenCombine · Jul 28, 2021 · b27b2c3 · b27b2c3
1 parent 3d3adb5
commit b27b2c3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/Tests/OpenCombineTests/Helpers/AutomaticallyFinish.swift b/Tests/OpenCombineTests/Helpers/AutomaticallyFinish.swift
@@ -32,7 +32,7 @@ final class AutomaticallyFinish<Output, Failure: Error> {
     func listen(receiveCompletion: @escaping (Subscribers.Completion<Failure>) -> Void,
                 receiveValue: @escaping (Output) -> Void) -> AnyCancellable {
         return publisher.sink(receiveCompletion: receiveCompletion,
-                            receiveValue: receiveValue)
+                              receiveValue: receiveValue)
     }
 }
 

diff --git a/Tests/OpenCombineTests/Helpers/CustomPublisher.swift b/Tests/OpenCombineTests/Helpers/CustomPublisher.swift
@@ -30,10 +30,8 @@ import OpenCombine
 ///     publisher.subscribe(subscriber)
 ///
 ///     assert(subscription.history == [.requested(.max(42)), .cancelled])
-@available(macOS 10.15, iOS 13.0, *)
 typealias CustomPublisher = CustomPublisherBase<Int, TestingError>
 
-@available(macOS 10.15, iOS 13.0, *)
 class CustomPublisherBase<Output, Failure: Error>: Publisher, Cancellable {
 
     private(set) var subscriber: AnySubscriber<Output, Failure>?
@@ -83,18 +81,15 @@ class CustomPublisherBase<Output, Failure: Error>: Publisher, Cancellable {
     }
 }
 
-@available(macOS 10.15, iOS 13.0, *)
 extension CustomPublisherBase: Equatable {
     static func == (lhs: CustomPublisherBase<Output, Failure>,
                     rhs: CustomPublisherBase<Output, Failure>) -> Bool {
         return lhs === rhs
     }
 }
 
-@available(macOS 10.15, iOS 13.0, *)
 typealias CustomConnectablePublisher = CustomConnectablePublisherBase<Int, TestingError>
 
-@available(macOS 10.15, iOS 13.0, *)
 final class CustomConnectablePublisherBase<Output, Failure: Error>
     : CustomPublisherBase<Output, Failure>,
       ConnectablePublisher

diff --git a/Tests/OpenCombineTests/Helpers/CustomSubscription.swift b/Tests/OpenCombineTests/Helpers/CustomSubscription.swift
@@ -16,7 +16,6 @@ import OpenCombine
 ///
 /// In order to inject `CustomSubscription` into the chain of subscriptions,
 /// use the `CustomSubscriber` class.
-@available(macOS 10.15, iOS 13.0, *)
 final class CustomSubscription: Subscription, CustomStringConvertible {
 
     enum Event: Equatable, CustomStringConvertible {
@@ -79,7 +78,6 @@ final class CustomSubscription: Subscription, CustomStringConvertible {
     var description: String { return "CustomSubscription" }
 }
 
-@available(macOS 10.15, iOS 13.0, *)
 extension CustomSubscription: Equatable {
     static func == (lhs: CustomSubscription, rhs: CustomSubscription) -> Bool {
         return lhs === rhs