ReactiveX/RxSwift
1
1
Fork 0
mirror of https://github.com/ReactiveX/RxSwift.git synced 2024-10-04 22:17:41 +03:00
Code Issues Projects Releases Wiki Activity

Rename catchError(_:) to catch(_:)

Browse Source
This commit is contained in:
freak4pc 2020-10-03 18:17:56 +03:00 committed by Shai Mishali
parent 5e343b8a58
commit aca1109b6b
12 changed files with 79 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RxCocoa/Common/DelegateProxyType.swift
View File

@ -332,7 +332,7 @@ extension DelegateProxyType where ParentObject: HasPrefetchDataSource, Self.Dele
let subscription = self.asObservable() let subscription = self.asObservable()
.observeOn(MainScheduler()) .observeOn(MainScheduler())
.catchError { error in .catch { error in
bindingError(error) bindingError(error)
return Observable.empty() return Observable.empty()
} }

4
RxCocoa/Traits/Driver/ObservableConvertibleType+Driver.swift
View File

@ -33,7 +33,7 @@ extension ObservableConvertibleType {
let source = self let source = self
.asObservable() .asObservable()
.observeOn(DriverSharingStrategy.scheduler) .observeOn(DriverSharingStrategy.scheduler)
.catchError { _ in .catch { _ in
onErrorDriveWith.asObservable() onErrorDriveWith.asObservable()
} }
return Driver(source) return Driver(source)
@ -49,7 +49,7 @@ extension ObservableConvertibleType {
let source = self let source = self
.asObservable() .asObservable()
.observeOn(DriverSharingStrategy.scheduler) .observeOn(DriverSharingStrategy.scheduler)
.catchError { error in .catch { error in
onErrorRecover(error).asObservable() onErrorRecover(error).asObservable()
} }
return Driver(source) return Driver(source)

4
RxCocoa/Traits/SharedSequence/ObservableConvertibleType+SharedSequence.swift
View File

@ -33,7 +33,7 @@ extension ObservableConvertibleType {
let source = self let source = self
.asObservable() .asObservable()
.observeOn(S.scheduler) .observeOn(S.scheduler)
.catchError { _ in .catch { _ in
onErrorDriveWith.asObservable() onErrorDriveWith.asObservable()
} }
return SharedSequence(source) return SharedSequence(source)
@ -49,7 +49,7 @@ extension ObservableConvertibleType {
let source = self let source = self
.asObservable() .asObservable()
.observeOn(S.scheduler) .observeOn(S.scheduler)
.catchError { error in .catch { error in
onErrorRecover(error).asObservable() onErrorRecover(error).asObservable()
} }
return SharedSequence(source) return SharedSequence(source)

4
RxCocoa/Traits/Signal/ObservableConvertibleType+Signal.swift
View File

@ -33,7 +33,7 @@ extension ObservableConvertibleType {
let source = self let source = self
.asObservable() .asObservable()
.observeOn(SignalSharingStrategy.scheduler) .observeOn(SignalSharingStrategy.scheduler)
.catchError { _ in .catch { _ in
onErrorSignalWith.asObservable() onErrorSignalWith.asObservable()
} }
return Signal(source) return Signal(source)
@ -49,7 +49,7 @@ extension ObservableConvertibleType {
let source = self let source = self
.asObservable() .asObservable()
.observeOn(SignalSharingStrategy.scheduler) .observeOn(SignalSharingStrategy.scheduler)
.catchError { error in .catch { error in
onErrorRecover(error).asObservable() onErrorRecover(error).asObservable()
} }
return Signal(source) return Signal(source)

2
RxExample/RxExample/Services/ReachabilityService.swift
View File

@ -76,7 +76,7 @@ class DefaultReachabilityService
extension ObservableConvertibleType { extension ObservableConvertibleType {
func retryOnBecomesReachable(_ valueOnFailure:Element, reachabilityService: ReachabilityService) -> Observable<Element> { func retryOnBecomesReachable(_ valueOnFailure:Element, reachabilityService: ReachabilityService) -> Observable<Element> {
return self.asObservable() return self.asObservable()
.catchError { (e) -> Observable<Element> in .catch { e -> Observable<Element> in
reachabilityService.reachability reachabilityService.reachability
.skip(1) .skip(1)
.filter { $0.reachable } .filter { $0.reachable }

29
RxSwift/Observables/Catch.swift
View File

@ -16,11 +16,25 @@ extension ObservableType {
- parameter handler: Error handler function, producing another observable sequence. - parameter handler: Error handler function, producing another observable sequence.
- returns: An observable sequence containing the source sequence's elements, followed by the elements produced by the handler's resulting observable sequence in case an error occurred. - returns: An observable sequence containing the source sequence's elements, followed by the elements produced by the handler's resulting observable sequence in case an error occurred.
*/ */
public func catchError(_ handler: @escaping (Swift.Error) throws -> Observable<Element>) public func `catch`(_ handler: @escaping (Swift.Error) throws -> Observable<Element>)
-> Observable<Element> { -> Observable<Element> {
Catch(source: self.asObservable(), handler: handler) Catch(source: self.asObservable(), handler: handler)
} }
/**
Continues an observable sequence that is terminated by an error with the observable sequence produced by the handler.
- seealso: [catch operator on reactivex.io](http://reactivex.io/documentation/operators/catch.html)
- parameter handler: Error handler function, producing another observable sequence.
- returns: An observable sequence containing the source sequence's elements, followed by the elements produced by the handler's resulting observable sequence in case an error occurred.
*/
@available(*, deprecated, renamed: "catch(_:)")
public func catchError(_ handler: @escaping (Swift.Error) throws -> Observable<Element>)
-> Observable<Element> {
`catch`(handler)
}
/** /**
Continues an observable sequence that is terminated by an error with a single element. Continues an observable sequence that is terminated by an error with a single element.
@ -44,7 +58,20 @@ extension ObservableType {
- returns: An observable sequence containing elements from consecutive source sequences until a source sequence terminates successfully. - returns: An observable sequence containing elements from consecutive source sequences until a source sequence terminates successfully.
*/ */
@available(*, deprecated, renamed: "catch(onSuccess:onFailure:onDisposed:)")
public static func catchError<Sequence: Swift.Sequence>(_ sequence: Sequence) -> Observable<Element> public static func catchError<Sequence: Swift.Sequence>(_ sequence: Sequence) -> Observable<Element>
where Sequence.Element == Observable<Element> {
`catch`(sequence: sequence)
}
/**
Continues an observable sequence that is terminated by an error with the next observable sequence.
- seealso: [catch operator on reactivex.io](http://reactivex.io/documentation/operators/catch.html)
- returns: An observable sequence containing elements from consecutive source sequences until a source sequence terminates successfully.
*/
public static func `catch`<Sequence: Swift.Sequence>(sequence: Sequence) -> Observable<Element>
where Sequence.Element == Observable<Element> { where Sequence.Element == Observable<Element> {
CatchSequence(sources: sequence) CatchSequence(sources: sequence)
} }

4
RxSwift/Traits/Infallible/ObservableConvertibleType+Infallible.swift
View File

@ -12,10 +12,10 @@ extension ObservableConvertibleType {
} }
func asInfallible(onErrorFallbackTo infallible: Infallible<Element>) -> Infallible<Element> { func asInfallible(onErrorFallbackTo infallible: Infallible<Element>) -> Infallible<Element> {
Infallible(self.asObservable().catchError { _ in infallible.asObservable() }) Infallible(self.asObservable().catch { _ in infallible.asObservable() })
} }
func asInfallible(onErrorRecover: @escaping (Swift.Error) -> Infallible<Element>) -> Infallible<Element> { func asInfallible(onErrorRecover: @escaping (Swift.Error) -> Infallible<Element>) -> Infallible<Element> {
Infallible(asObservable().catchError { onErrorRecover($0).asObservable() }) Infallible(asObservable().catch { onErrorRecover($0).asObservable() })
} }
} }

16
RxSwift/Traits/PrimitiveSequence/PrimitiveSequence.swift
View File

@ -135,9 +135,23 @@ extension PrimitiveSequence {
- parameter handler: Error handler function, producing another observable sequence. - parameter handler: Error handler function, producing another observable sequence.
- returns: An observable sequence containing the source sequence's elements, followed by the elements produced by the handler's resulting observable sequence in case an error occurred. - returns: An observable sequence containing the source sequence's elements, followed by the elements produced by the handler's resulting observable sequence in case an error occurred.
*/ */
@available(*, deprecated, renamed: "catch(_:)")
public func catchError(_ handler: @escaping (Swift.Error) throws -> PrimitiveSequence<Trait, Element>) public func catchError(_ handler: @escaping (Swift.Error) throws -> PrimitiveSequence<Trait, Element>)
-> PrimitiveSequence<Trait, Element> { -> PrimitiveSequence<Trait, Element> {
PrimitiveSequence(raw: self.source.catchError { try handler($0).asObservable() }) `catch`(handler)
}
/**
Continues an observable sequence that is terminated by an error with the observable sequence produced by the handler.
- seealso: [catch operator on reactivex.io](http://reactivex.io/documentation/operators/catch.html)
- parameter handler: Error handler function, producing another observable sequence.
- returns: An observable sequence containing the source sequence's elements, followed by the elements produced by the handler's resulting observable sequence in case an error occurred.
*/
public func `catch`(_ handler: @escaping (Swift.Error) throws -> PrimitiveSequence<Trait, Element>)
-> PrimitiveSequence<Trait, Element> {
PrimitiveSequence(raw: self.source.catch { try handler($0).asObservable() })
} }
/** /**

8
Tests/RxSwiftTests/CompletableTest.swift
View File

@ -272,7 +272,7 @@ extension CompletableTest {
let scheduler = TestScheduler(initialClock: 0) let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start { let res = scheduler.start {
Completable.error(testError).catchError { _ in Completable.empty() } Completable.error(testError).catch { _ in Completable.empty() }
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -286,7 +286,7 @@ extension CompletableTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
Completable.error(testError) Completable.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }
@ -310,7 +310,7 @@ extension CompletableTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
Completable.error(testError) Completable.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }
@ -336,7 +336,7 @@ extension CompletableTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
Completable.error(testError) Completable.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }

8
Tests/RxSwiftTests/MaybeTest.swift
View File

@ -350,7 +350,7 @@ extension MaybeTest {
let scheduler = TestScheduler(initialClock: 0) let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start { let res = scheduler.start {
Maybe.error(testError).catchError { _ in Maybe.just(2) } Maybe.error(testError).catch { _ in Maybe.just(2) }
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -378,7 +378,7 @@ extension MaybeTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
Maybe.error(testError) Maybe.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }
@ -403,7 +403,7 @@ extension MaybeTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
Maybe.error(testError) Maybe.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }
@ -430,7 +430,7 @@ extension MaybeTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
Maybe.error(testError) Maybe.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }

28
Tests/RxSwiftTests/Observable+CatchTests.swift
View File

@ -32,7 +32,7 @@ extension ObservableCatchTest {
var handlerCalled: Int? var handlerCalled: Int?
let res = scheduler.start { let res = scheduler.start {
o1.catchError { _ in o1.catch { _ in
handlerCalled = scheduler.clock handlerCalled = scheduler.clock
return o2.asObservable() return o2.asObservable()
} }
@ -69,7 +69,7 @@ extension ObservableCatchTest {
var handlerCalled: Int? var handlerCalled: Int?
let res = scheduler.start { let res = scheduler.start {
o1.catchError { _ in o1.catch { _ in
handlerCalled = scheduler.clock handlerCalled = scheduler.clock
throw testError1 throw testError1
} }
@ -90,15 +90,15 @@ extension ObservableCatchTest {
#if TRACE_RESOURCES #if TRACE_RESOURCES
func testCatchReleasesResourcesOnComplete() { func testCatchReleasesResourcesOnComplete() {
_ = Observable<Int>.just(1).catchError { _ in Observable<Int>.just(1) }.subscribe() _ = Observable<Int>.just(1).catch { _ in Observable<Int>.just(1) }.subscribe()
} }
func tesCatch1ReleasesResourcesOnError() { func tesCatch1ReleasesResourcesOnError() {
_ = Observable<Int>.error(testError).catchError { _ in Observable<Int>.just(1) }.subscribe() _ = Observable<Int>.error(testError).catch { _ in Observable<Int>.just(1) }.subscribe()
} }
func tesCatch2ReleasesResourcesOnError() { func tesCatch2ReleasesResourcesOnError() {
_ = Observable<Int>.error(testError).catchError { _ in Observable<Int>.error(testError) }.subscribe() _ = Observable<Int>.error(testError).catch { _ in Observable<Int>.error(testError) }.subscribe()
} }
#endif #endif
} }
@ -130,7 +130,7 @@ extension ObservableCatchTest {
]) ])
let res = scheduler.start { let res = scheduler.start {
Observable.catchError([xs1.asObservable(), xs2.asObservable(), xs3.asObservable()]) Observable.catch(sequence: [xs1.asObservable(), xs2.asObservable(), xs3.asObservable()])
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -175,7 +175,7 @@ extension ObservableCatchTest {
]) ])
let res = scheduler.start { let res = scheduler.start {
Observable.catchError([xs1, xs2].map { $0.asObservable() }) Observable.catch(sequence: [xs1, xs2].map { $0.asObservable() })
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -205,7 +205,7 @@ extension ObservableCatchTest {
]) ])
let res = scheduler.start { let res = scheduler.start {
Observable.catchError([xs1, xs2].map { $0.asObservable() }) Observable.catch(sequence: [xs1, xs2].map { $0.asObservable() })
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -233,7 +233,7 @@ extension ObservableCatchTest {
]) ])
let res = scheduler.start { let res = scheduler.start {
Observable.catchError([xs1, xs2].map { $0.asObservable() }) Observable.catch(sequence: [xs1, xs2].map { $0.asObservable() })
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -264,7 +264,7 @@ extension ObservableCatchTest {
]) ])
let res = scheduler.start { let res = scheduler.start {
Observable.catchError([xs1, xs2].map { $0.asObservable() }) Observable.catch(sequence: [xs1, xs2].map { $0.asObservable() })
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -298,7 +298,7 @@ extension ObservableCatchTest {
]) ])
let res = scheduler.start { let res = scheduler.start {
Observable.catchError([xs1, xs2].map { $0.asObservable() }) Observable.catch(sequence: [xs1, xs2].map { $0.asObservable() })
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -331,7 +331,7 @@ extension ObservableCatchTest {
]) ])
let res = scheduler.start { let res = scheduler.start {
Observable.catchError([xs1, xs2].map { $0.asObservable() }) Observable.catch(sequence: [xs1, xs2].map { $0.asObservable() })
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -369,7 +369,7 @@ extension ObservableCatchTest {
]) ])
let res = scheduler.start { let res = scheduler.start {
Observable.catchError([xs1.asObservable(), xs2.asObservable(), xs3.asObservable()]) Observable.catch(sequence: [xs1.asObservable(), xs2.asObservable(), xs3.asObservable()])
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -394,7 +394,7 @@ extension ObservableCatchTest {
#if TRACE_RESOURCES #if TRACE_RESOURCES
func testCatchSequenceReleasesResourcesOnComplete() { func testCatchSequenceReleasesResourcesOnComplete() {
_ = Observable.catchError([Observable<Int>.just(1)]).subscribe() _ = Observable.catch(sequence: [Observable<Int>.just(1)]).subscribe()
} }
#endif #endif
} }

8
Tests/RxSwiftTests/SingleTest.swift
View File

@ -287,7 +287,7 @@ extension SingleTest {
let scheduler = TestScheduler(initialClock: 0) let scheduler = TestScheduler(initialClock: 0)
let res = scheduler.start { let res = scheduler.start {
Single.error(testError).catchError { _ in Single.just(2) } Single.error(testError).catch { _ in Single.just(2) }
} }
XCTAssertEqual(res.events, [ XCTAssertEqual(res.events, [
@ -315,7 +315,7 @@ extension SingleTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
(Single.error(testError) (Single.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }
@ -341,7 +341,7 @@ extension SingleTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
(Single.error(testError) (Single.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }
@ -369,7 +369,7 @@ extension SingleTest {
var isFirst = true var isFirst = true
let res = scheduler.start { let res = scheduler.start {
(Single.error(testError) (Single.error(testError)
.catchError { e in .catch { e in
defer { defer {
isFirst = false isFirst = false
} }