Skip to content

Commit

Permalink
Merge pull request RxSwiftCommunity#229 from TTOzzi/master
Browse files Browse the repository at this point in the history
Fixing deprecated warnings
  • Loading branch information
ashfurrow authored Feb 22, 2021
2 parents 2f2e1e2 + 97c56a6 commit 2546b57
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Sources/Action/Action.swift
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ public final class Action<Input, Element> {
.share()

elements = executionObservables
.flatMap { $0.catchError { _ in Observable.empty() } }
.flatMap { $0.catch { _ in Observable.empty() } }

executing = executionObservables.flatMap {
execution -> Observable<Bool> in
let execution = execution
.flatMap { _ in Observable<Bool>.empty() }
.catchError { _ in Observable.empty() }
.catch { _ in Observable.empty() }

return Observable.concat([Observable.just(true),
execution,
Expand All @@ -124,7 +124,7 @@ public final class Action<Input, Element> {
let subject = ReplaySubject<Element>.createUnbounded()

let work = executionObservables
.map { $0.catchError { throw ActionError.underlyingError($0) } }
.map { $0.catch { throw ActionError.underlyingError($0) } }

let error = errors
.map { Observable<Element>.error($0) }
Expand Down

0 comments on commit 2546b57

Please sign in to comment.