Skip to content

Tidied up some code using optional map #2549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
freak4pc merged 3 commits into from
Oct 3, 2024
+3 −18
Merged

Tidied up some code using optional map #2549

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c5583c
Tidied up some code using optional map
BenMaer Oct 17, 2023
f4c79e3
Updated optional map to take a function as a parameter, instead of a …
BenMaer Jan 4, 2024
1d92ba3
Updated Single and Maybe optional map to take a function as a paramet…
BenMaer Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions RxSwift/Traits/PrimitiveSequence/Completable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,7 @@ extension PrimitiveSequenceType where Trait == CompletableTrait, Element == Swif
let callStack = [String]()
#endif

let disposable: Disposable
if let onDisposed = onDisposed {
disposable = Disposables.create(with: onDisposed)
} else {
disposable = Disposables.create()
}
let disposable: Disposable = onDisposed.map({ Disposables.create(with: $0) }) ?? Disposables.create()

let observer: CompletableObserver = { event in
switch event {
Expand Down
7 changes: 1 addition & 6 deletions RxSwift/Traits/PrimitiveSequence/Maybe.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,7 @@ extension PrimitiveSequenceType where Trait == MaybeTrait {
#else
let callStack = [String]()
#endif
let disposable: Disposable
if let onDisposed = onDisposed {
disposable = Disposables.create(with: onDisposed)
} else {
disposable = Disposables.create()
}
let disposable: Disposable = onDisposed.map({ Disposables.create(with: $0) }) ?? Disposables.create()
Copy link
Copy Markdown
Member

@freak4pc freak4pc Oct 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Copy link
Copy Markdown
Contributor Author

@BenMaer BenMaer Jan 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated


let observer: MaybeObserver = { event in
switch event {
Expand Down
7 changes: 1 addition & 6 deletions RxSwift/Traits/PrimitiveSequence/Single.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,7 @@ extension PrimitiveSequenceType where Trait == SingleTrait {
let callStack = [String]()
#endif

let disposable: Disposable
if let onDisposed = onDisposed {
disposable = Disposables.create(with: onDisposed)
} else {
disposable = Disposables.create()
}
let disposable: Disposable = onDisposed.map({ Disposables.create(with: $0) }) ?? Disposables.create()
Copy link
Copy Markdown
Member

@freak4pc freak4pc Oct 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto :)

Copy link
Copy Markdown
Contributor Author

@BenMaer BenMaer Jan 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated


let observer: SingleObserver = { event in
switch event {
Expand Down