From 7c5583ccd2c536db34d43a3cb19fffea02f2f4a2 Mon Sep 17 00:00:00 2001
From: Ben Maer <ben@resplendent.co>
Date: Mon, 16 Oct 2023 20:41:05 -0400
Subject: [PATCH 1/3] Tidied up some code using optional map

---
 RxSwift/Traits/PrimitiveSequence/Completable.swift | 7 +------
 RxSwift/Traits/PrimitiveSequence/Maybe.swift       | 7 +------
 RxSwift/Traits/PrimitiveSequence/Single.swift      | 7 +------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/RxSwift/Traits/PrimitiveSequence/Completable.swift b/RxSwift/Traits/PrimitiveSequence/Completable.swift
index ff8fae21ac..b8b9800f22 100644
--- a/RxSwift/Traits/PrimitiveSequence/Completable.swift
+++ b/RxSwift/Traits/PrimitiveSequence/Completable.swift
@@ -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 {
diff --git a/RxSwift/Traits/PrimitiveSequence/Maybe.swift b/RxSwift/Traits/PrimitiveSequence/Maybe.swift
index 13f472ab9b..89aaaf3c09 100644
--- a/RxSwift/Traits/PrimitiveSequence/Maybe.swift
+++ b/RxSwift/Traits/PrimitiveSequence/Maybe.swift
@@ -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()
 
         let observer: MaybeObserver = { event in
             switch event {
diff --git a/RxSwift/Traits/PrimitiveSequence/Single.swift b/RxSwift/Traits/PrimitiveSequence/Single.swift
index ffb8aa9176..514b0b9c53 100644
--- a/RxSwift/Traits/PrimitiveSequence/Single.swift
+++ b/RxSwift/Traits/PrimitiveSequence/Single.swift
@@ -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()
 
         let observer: SingleObserver = { event in
             switch event {

From f4c79e3e75e5af57759f1c7edc7290362aa91b9d Mon Sep 17 00:00:00 2001
From: Benjamin Maer <ben@resplendent.co>
Date: Thu, 4 Jan 2024 17:37:17 -0500
Subject: [PATCH 2/3] Updated optional map to take a function as a parameter,
 instead of a closure.

Co-authored-by: Shai Mishali <freak4pc@gmail.com>
---
 RxSwift/Traits/PrimitiveSequence/Completable.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RxSwift/Traits/PrimitiveSequence/Completable.swift b/RxSwift/Traits/PrimitiveSequence/Completable.swift
index b8b9800f22..1bca0ffa4d 100644
--- a/RxSwift/Traits/PrimitiveSequence/Completable.swift
+++ b/RxSwift/Traits/PrimitiveSequence/Completable.swift
@@ -123,7 +123,7 @@ extension PrimitiveSequenceType where Trait == CompletableTrait, Element == Swif
                 let callStack = [String]()
         #endif
 
-        let disposable: Disposable = onDisposed.map({ Disposables.create(with: $0) }) ?? Disposables.create()
+        let disposable: Disposable = onDisposed.map(Disposables.create(with:)) ?? Disposables.create()
 
         let observer: CompletableObserver = { event in
             switch event {

From 1d92ba310ea5c84e27fce5094a1c1821c55df12f Mon Sep 17 00:00:00 2001
From: Ben Maer <ben@resplendent.co>
Date: Thu, 4 Jan 2024 17:40:33 -0500
Subject: [PATCH 3/3] Updated Single and Maybe optional map to take a function
 as a parameter, instead of a closure.

---
 RxSwift/Traits/PrimitiveSequence/Maybe.swift  | 2 +-
 RxSwift/Traits/PrimitiveSequence/Single.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RxSwift/Traits/PrimitiveSequence/Maybe.swift b/RxSwift/Traits/PrimitiveSequence/Maybe.swift
index 89aaaf3c09..d73048fb3e 100644
--- a/RxSwift/Traits/PrimitiveSequence/Maybe.swift
+++ b/RxSwift/Traits/PrimitiveSequence/Maybe.swift
@@ -138,7 +138,7 @@ extension PrimitiveSequenceType where Trait == MaybeTrait {
         #else
             let callStack = [String]()
         #endif
-        let disposable: Disposable = onDisposed.map({ Disposables.create(with: $0) }) ?? Disposables.create()
+        let disposable: Disposable = onDisposed.map(Disposables.create(with:)) ?? Disposables.create()
 
         let observer: MaybeObserver = { event in
             switch event {
diff --git a/RxSwift/Traits/PrimitiveSequence/Single.swift b/RxSwift/Traits/PrimitiveSequence/Single.swift
index 514b0b9c53..79595d175c 100644
--- a/RxSwift/Traits/PrimitiveSequence/Single.swift
+++ b/RxSwift/Traits/PrimitiveSequence/Single.swift
@@ -135,7 +135,7 @@ extension PrimitiveSequenceType where Trait == SingleTrait {
             let callStack = [String]()
         #endif
 
-        let disposable: Disposable = onDisposed.map({ Disposables.create(with: $0) }) ?? Disposables.create()
+        let disposable: Disposable = onDisposed.map(Disposables.create(with:)) ?? Disposables.create()
 
         let observer: SingleObserver = { event in
             switch event {