Some cleanup

Examples/CaseStudies/SwiftUICaseStudies/02-Effects-WebSocket.swift

@@ -316,7 +316,7 @@ extension WebSocketClient: DependencyKey {
         let socket = try self.socket(id: id)
         return try await withCheckedThrowingContinuation { continuation in
           socket.sendPing { error in
-            if let error = error {
+            if let error {
               continuation.resume(throwing: error)
             } else {
               continuation.resume()

Examples/CaseStudies/UIKitCaseStudies/Internal/IfLetStoreController.swift

@@ -10,11 +10,11 @@ final class IfLetStoreController<State, Action>: UIViewController {
   private var cancellables: Set<AnyCancellable> = []
   private var viewController = UIViewController() {
     willSet {
-      self.viewController.willMove(toParent: nil)
-      self.viewController.view.removeFromSuperview()
-      self.viewController.removeFromParent()
-      self.addChild(newValue)
-      self.view.addSubview(newValue.view)
+      viewController.willMove(toParent: nil)
+      viewController.view.removeFromSuperview()
+      viewController.removeFromParent()
+      addChild(newValue)
+      view.addSubview(newValue.view)
       newValue.didMove(toParent: self)
     }
   }
@@ -37,16 +37,16 @@ final class IfLetStoreController<State, Action>: UIViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    self.store.ifLet(
+    store.ifLet(
       then: { [weak self] store in
-        guard let self = self else { return }
-        self.viewController = self.ifDestination(store)
+        guard let self else { return }
+        viewController = ifDestination(store)
       },
       else: { [weak self] in
-        guard let self = self else { return }
-        self.viewController = self.elseDestination()
+        guard let self else { return }
+        viewController = elseDestination()
       }
     )
-    .store(in: &self.cancellables)
+    .store(in: &cancellables)
   }
 }

Examples/Search/Search/SearchView.swift

@@ -171,7 +171,7 @@ struct SearchView: View {
 
   @ViewBuilder
   func weatherView(locationWeather: Search.State.Weather?) -> some View {
-    if let locationWeather = locationWeather {
+    if let locationWeather {
       let days = locationWeather.days
         .enumerated()
         .map { idx, weather in formattedWeather(day: weather, isToday: idx == 0) }

Examples/TicTacToe/tic-tac-toe/Sources/LoginUIKit/LoginViewController.swift

@@ -88,10 +88,10 @@ public class LoginViewController: UIViewController {
     ])
 
     var alertController: UIAlertController?
-    var twoFactorViewController: TwoFactorViewController?
+    var twoFactorController: TwoFactorViewController?
 
     observe { [weak self] in
-      guard let self = self else { return }
+      guard let self else { return }
       emailTextField.text = store.email
       emailTextField.isEnabled = store.isEmailTextFieldEnabled
       passwordTextField.text = store.password
@@ -110,16 +110,16 @@ public class LoginViewController: UIViewController {
       }
 
       if let store = store.scope(state: \.twoFactor, action: \.twoFactor.presented),
-        twoFactorViewController == nil
+         twoFactorController == nil
       {
-        twoFactorViewController = TwoFactorViewController(store: store)
+        twoFactorController = TwoFactorViewController(store: store)
         navigationController?.pushViewController(
-          twoFactorViewController!,
+          twoFactorController!,
           animated: true
         )
-      } else if store.alert == nil, twoFactorViewController != nil {
-        twoFactorViewController?.dismiss(animated: true)
-        twoFactorViewController = nil
+      } else if store.twoFactor == nil, twoFactorController != nil {
+        navigationController?.popToViewController(self, animated: true)
+        twoFactorController = nil
       }
     }
   }

Examples/TicTacToe/tic-tac-toe/Sources/NewGameUIKit/NewGameViewController.swift

@@ -87,7 +87,7 @@ public class NewGameViewController: UIViewController {
     var gameController: GameViewController?
 
     observe { [weak self] in
-      guard let self = self else { return }
+      guard let self else { return }
       playerOTextField.text = store.oPlayerName
       playerXTextField.text = store.xPlayerName
       letsPlayButton.isEnabled = store.isLetsPlayButtonEnabled
@@ -97,8 +97,8 @@ public class NewGameViewController: UIViewController {
       {
         gameController = GameViewController(store: store)
         navigationController?.pushViewController(gameController!, animated: true)
-      } else if gameController != nil {
-        gameController?.dismiss(animated: true)
+      } else if store.game == nil, gameController != nil {
+        navigationController?.popToViewController(self, animated: true)
         gameController = nil
       }
     }

Examples/TicTacToe/tic-tac-toe/Sources/TwoFactorUIKit/TwoFactorViewController.swift

@@ -60,7 +60,7 @@ public final class TwoFactorViewController: UIViewController {
     var alertController: UIAlertController?
 
     observe { [weak self] in
-      guard let self = self else { return }
+      guard let self else { return }
       activityIndicator.isHidden = store.isActivityIndicatorHidden
       codeTextField.text = store.code
       loginButton.isEnabled = store.isLoginButtonEnabled

Sources/ComposableArchitecture/Effect.swift

@@ -97,7 +97,7 @@ extension Effect {
             } catch is CancellationError {
               return
             } catch {
-              guard let handler = handler else {
+              guard let handler else {
                 #if DEBUG
                   var errorDump = ""
                   customDump(error, to: &errorDump, indent: 4)
@@ -324,12 +324,12 @@ extension Effect {
     case let (.run(lhsPriority, lhsOperation), .run(rhsPriority, rhsOperation)):
       return Self(
         operation: .run { send in
-          if let lhsPriority = lhsPriority {
+          if let lhsPriority {
             await Task(priority: lhsPriority) { await lhsOperation(send) }.cancellableValue
           } else {
             await lhsOperation(send)
           }
-          if let rhsPriority = rhsPriority {
+          if let rhsPriority {
             await Task(priority: rhsPriority) { await rhsOperation(send) }.cancellableValue
           } else {
             await rhsOperation(send)

Sources/ComposableArchitecture/Observation/Alert+Observation.swift

@@ -15,11 +15,11 @@ extension View {
           Button(role: button.role.map(ButtonRole.init)) {
             switch button.action.type {
             case let .send(action):
-              if let action = action {
+              if let action {
                 store?.send(action)
               }
             case let .animatedSend(action, animation):
-              if let action = action {
+              if let action {
                 store?.send(action, animation: animation)
               }
             }
@@ -54,11 +54,11 @@ extension View {
           Button(role: button.role.map(ButtonRole.init)) {
             switch button.action.type {
             case let .send(action):
-              if let action = action {
+              if let action {
                 store?.send(action)
               }
             case let .animatedSend(action, animation):
-              if let action = action {
+              if let action {
                 store?.send(action, animation: animation)
               }
             }

Sources/ComposableArchitecture/RootStore.swift

@@ -78,7 +78,7 @@ public final class RootStore {
                   self?.effectCancellables[uuid] = nil
                 },
                 receiveValue: { [weak self] effectAction in
-                  guard let self = self else { return }
+                  guard let self else { return }
                   if let task = continuation.yield({
                     self.send(effectAction, originatingFrom: action)
                   }) {

Sources/ComposableArchitecture/Store.swift

@@ -170,7 +170,7 @@ public final class Store<State, Action> {
     @ReducerBuilder<State, Action> reducer: () -> R,
     withDependencies prepareDependencies: ((inout DependencyValues) -> Void)? = nil
   ) where R.State == State, R.Action == Action {
-    if let prepareDependencies = prepareDependencies {
+    if let prepareDependencies {
       let (initialState, reducer, dependencies) = withDependencies(prepareDependencies) {
         @Dependency(\.self) var dependencies
         return (initialState(), reducer(), dependencies)
@@ -353,7 +353,7 @@ public final class Store<State, Action> {
         isInvalid?(self.currentState) == true || self._isInvalidated()
       }
       : { [weak self] in
-        guard let self = self else { return true }
+        guard let self else { return true }
         return isInvalid?(self.currentState) == true || self._isInvalidated()
       }
     childStore.canCacheChildren = self.canCacheChildren && id != nil

Sources/ComposableArchitecture/SwiftUI/Alert.swift

@@ -69,11 +69,11 @@ extension View {
             Button(role: button.role.map(ButtonRole.init)) {
               switch button.action.type {
               case let .send(action):
-                if let action = action {
+                if let action {
                   store.send(.presented(fromDestinationAction(action)))
                 }
               case let .animatedSend(action, animation):
-                if let action = action {
+                if let action {
                   store.send(.presented(fromDestinationAction(action)), animation: animation)
                 }
               }

Sources/ComposableArchitecture/SwiftUI/ConfirmationDialog.swift

@@ -74,11 +74,11 @@ extension View {
             Button(role: button.role.map(ButtonRole.init)) {
               switch button.action.type {
               case let .send(action):
-                if let action = action {
+                if let action {
                   store.send(.presented(fromDestinationAction(action)))
                 }
               case let .animatedSend(action, animation):
-                if let action = action {
+                if let action {
                   store.send(.presented(fromDestinationAction(action)), animation: animation)
                 }
               }

Sources/ComposableArchitecture/SwiftUI/Deprecated/ActionSheet.swift

@@ -76,7 +76,7 @@ extension View {
       let actionSheetState = store.withState { $0.wrappedValue.flatMap(toDestinationState) }
       self.actionSheet(item: $item) { _ in
         ActionSheet(actionSheetState!) { action in
-          if let action = action {
+          if let action {
             store.send(.presented(fromDestinationAction(action)))
           } else {
             store.send(.dismiss)

Sources/ComposableArchitecture/SwiftUI/Deprecated/LegacyAlert.swift

@@ -65,7 +65,7 @@ extension View {
       let alertState = store.withState { $0.wrappedValue.flatMap(toDestinationState) }
       self.alert(item: $item) { _ in
         Alert(alertState!) { action in
-          if let action = action {
+          if let action {
             store.send(.presented(fromDestinationAction(action)))
           } else {
             store.send(.dismiss)

Sources/ComposableArchitecture/TestStore.swift

@@ -1007,7 +1007,7 @@ extension TestStore where State: Equatable {
     switch self.exhaustivity {
     case .on:
       var expectedWhenGivenPreviousState = expected
-      if let updateStateToExpectedResult = updateStateToExpectedResult {
+      if let updateStateToExpectedResult {
         try Dependencies.withDependencies {
           $0 = self.reducer.dependencies
         } operation: {
@@ -1024,7 +1024,7 @@ extension TestStore where State: Equatable {
 
     case .off:
       var expectedWhenGivenActualState = actual
-      if let updateStateToExpectedResult = updateStateToExpectedResult {
+      if let updateStateToExpectedResult {
         try Dependencies.withDependencies {
           $0 = self.reducer.dependencies
         } operation: {
@@ -1041,7 +1041,7 @@ extension TestStore where State: Equatable {
         && expectedWhenGivenActualState == actual
       {
         var expectedWhenGivenPreviousState = current
-        if let updateStateToExpectedResult = updateStateToExpectedResult {
+        if let updateStateToExpectedResult {
           XCTExpectFailure(strict: false) {
             do {
               try Dependencies.withDependencies {

Sources/ComposableArchitecture/UIKit/AlertStateUIKit.swift

@@ -21,11 +21,11 @@
     ///     viewStore.publisher
     ///       .settingsAlert
     ///       .sink { [weak self] alert in
-    ///         guard let self = self else { return }
-    ///         if let alert = alert {
-    ///           let alertController = UIAlertController(state: alert, send: {
+    ///         guard let self else { return }
+    ///         if let alert {
+    ///           let alertController = UIAlertController(state: alert) {
     ///             self.viewStore.send(.settings($0))
-    ///           })
+    ///           }
     ///           self.present(alertController, animated: true, completion: nil)
     ///           self.alertController = alertController
     ///         } else {

Sources/ComposableArchitecture/UIKit/IfLetUIKit.swift

@@ -29,7 +29,7 @@ extension Store {
   ///           )
   ///         },
   ///         else: { [weak self] in
-  ///           guard let self = self else { return }
+  ///           guard let self else { return }
   ///           self.navigationController?.popToViewController(self, animated: true)
   ///         }
   ///       )