Remove Cancellable conformances.

ReactiveCocoa · Apr 26, 2020 · dce8b0a · dce8b0a
1 parent 4cffe30
commit dce8b0a
Showing 1 changed file with 2 additions and 24 deletions.
diff --git a/Sources/CombineInteroperability/Utilities.swift b/Sources/CombineInteroperability/Utilities.swift
@@ -4,29 +4,7 @@ import Combine
 extension Lifetime {
 	@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
 	@discardableResult
-	public static func += <C: Cancellable>(lhs: Lifetime, rhs: C) -> Disposable? {
-		lhs.observeEnded(rhs.cancel)
+	public static func += <C: Cancellable>(lhs: Lifetime, rhs: C?) -> Disposable? {
+		rhs.flatMap { lhs.observeEnded($0.cancel) }
 	}
 }
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
-extension AnyDisposable: Cancellable {
-	public func cancel() {
-		dispose()
-	}
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
-extension SerialDisposable: Cancellable {
-	public func cancel() {
-		dispose()
-	}
-}
-
-@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
-extension CompositeDisposable: Cancellable {
-	public func cancel() {
-		dispose()
-	}
-}
-#endif