Skip to content

Commit d7b1a5d

Browse files
committed
Remove Cancellable conformances.
1 parent 4cffe30 commit d7b1a5d

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

Sources/CombineInteroperability/Utilities.swift

+3-23
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,9 @@ import Combine
44
extension Lifetime {
55
@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
66
@discardableResult
7-
public static func += <C: Cancellable>(lhs: Lifetime, rhs: C) -> Disposable? {
8-
lhs.observeEnded(rhs.cancel)
9-
}
10-
}
11-
12-
@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
13-
extension AnyDisposable: Cancellable {
14-
public func cancel() {
15-
dispose()
16-
}
17-
}
18-
19-
@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
20-
extension SerialDisposable: Cancellable {
21-
public func cancel() {
22-
dispose()
23-
}
24-
}
25-
26-
@available(macOS 10.15, iOS 13.0, tvOS 13.0, macCatalyst 13.0, watchOS 6.0, *)
27-
extension CompositeDisposable: Cancellable {
28-
public func cancel() {
29-
dispose()
7+
public static func += <C: Cancellable>(lhs: Lifetime, rhs: C?) -> Disposable? {
8+
rhs.flatMap { lhs.observeEnded($0.cancel) }
309
}
3110
}
3211
#endif
12+

0 commit comments

Comments
 (0)