Add cancel overloads that take types (#1078)

* Add cancel overloads that take types

* wip

Author: mluisbrown

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

@@ -40,18 +40,18 @@ let effectsCancellationReducer = Reducer<
   EffectsCancellationState, EffectsCancellationAction, EffectsCancellationEnvironment
 > { state, action, environment in
 
-  struct TriviaRequestId: Hashable {}
+  enum TriviaRequestId {}
 
   switch action {
   case .cancelButtonTapped:
     state.isTriviaRequestInFlight = false
-    return .cancel(id: TriviaRequestId())
+    return .cancel(id: TriviaRequestId.self)
 
   case let .stepperChanged(value):
     state.count = value
     state.currentTrivia = nil
     state.isTriviaRequestInFlight = false
-    return .cancel(id: TriviaRequestId())
+    return .cancel(id: TriviaRequestId.self)
 
   case .triviaButtonTapped:
     state.currentTrivia = nil
@@ -60,7 +60,7 @@ let effectsCancellationReducer = Reducer<
     return environment.fact.fetch(state.count)
       .observe(on: environment.mainQueue)
       .catchToEffect(EffectsCancellationAction.triviaResponse)
-      .cancellable(id: TriviaRequestId())
+      .cancellable(id: TriviaRequestId.self)
 
   case let .triviaResponse(.success(response)):
     state.isTriviaRequestInFlight = false

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

@@ -39,7 +39,7 @@ let longLivingEffectsReducer = Reducer<
   LongLivingEffectsState, LongLivingEffectsAction, LongLivingEffectsEnvironment
 > { state, action, environment in
 
-  struct UserDidTakeScreenshotNotificationId: Hashable {}
+  enum UserDidTakeScreenshotNotificationId {}
 
   switch action {
   case .userDidTakeScreenshotNotification:
@@ -50,11 +50,11 @@ let longLivingEffectsReducer = Reducer<
     // When the view appears, start the effect that emits when screenshots are taken.
     return environment.userDidTakeScreenshot
       .map { LongLivingEffectsAction.userDidTakeScreenshotNotification }
-      .cancellable(id: UserDidTakeScreenshotNotificationId())
+      .cancellable(id: UserDidTakeScreenshotNotificationId.self)
 
   case .onDisappear:
     // When view disappears, stop the effect.
-    return .cancel(id: UserDidTakeScreenshotNotificationId())
+    return .cancel(id: UserDidTakeScreenshotNotificationId.self)
   }
 }
 

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

@@ -37,12 +37,12 @@ let refreshableReducer = Reducer<
   RefreshableEnvironment
 > { state, action, environment in
 
-  struct CancelId: Hashable {}
+  enum CancelId {}
 
   switch action {
   case .cancelButtonTapped:
     state.isLoading = false
-    return .cancel(id: CancelId())
+    return .cancel(id: CancelId.self)
 
   case .decrementButtonTapped:
     state.count -= 1
@@ -68,7 +68,7 @@ let refreshableReducer = Reducer<
     return environment.fact.fetch(state.count)
       .delay(2, on: environment.mainQueue.animation())
       .catchToEffect(RefreshableAction.factResponse)
-      .cancellable(id: CancelId())
+      .cancellable(id: CancelId.self)
   }
 }
 

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

@@ -29,7 +29,8 @@ struct TimersEnvironment {
 
 let timersReducer = Reducer<TimersState, TimersAction, TimersEnvironment> {
   state, action, environment in
-  struct TimerId: Hashable {}
+
+  enum TimerId {}
 
   switch action {
   case .timerTicked:
@@ -40,13 +41,13 @@ let timersReducer = Reducer<TimersState, TimersAction, TimersEnvironment> {
     state.isTimerActive.toggle()
     return state.isTimerActive
       ? Effect.timer(
-        id: TimerId(),
+        id: TimerId.self,
         every: .seconds(1),
         tolerance: .seconds(0),
         on: environment.mainQueue.animation(.interpolatingSpring(stiffness: 3000, damping: 40))
       )
       .map { _ in TimersAction.timerTicked }
-      : Effect.cancel(id: TimerId())
+      : .cancel(id: TimerId.self)
   }
 }
 

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

@@ -41,6 +41,7 @@ struct WebSocketEnvironment {
 
 let webSocketReducer = Reducer<WebSocketState, WebSocketAction, WebSocketEnvironment> {
   state, action, environment in
+
   struct WebSocketId: Hashable {}
 
   var receiveSocketMessageEffect: Effect<WebSocketAction, Never> {

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-LoadThenNavigate.swift

@@ -53,14 +53,15 @@ let loadThenNavigateListReducer =
     with: Reducer<
       LoadThenNavigateListState, LoadThenNavigateListAction, LoadThenNavigateListEnvironment
     > { state, action, environment in
-      struct CancelId: Hashable {}
+
+      enum CancelId {}
 
       switch action {
       case .counter:
         return .none
 
       case .onDisappear:
-        return .cancel(id: CancelId())
+        return .cancel(id: CancelId.self)
 
       case let .setNavigation(selection: .some(navigatedId)):
         for row in state.rows {
@@ -69,14 +70,14 @@ let loadThenNavigateListReducer =
 
         return Effect(value: .setNavigationSelectionDelayCompleted(navigatedId))
           .delay(1, on: environment.mainQueue)
-          .cancellable(id: CancelId(), cancelInFlight: true)
+          .cancellable(id: CancelId.self, cancelInFlight: true)
 
       case .setNavigation(selection: .none):
         if let selection = state.selection {
           state.rows[id: selection.id]?.count = selection.count
         }
         state.selection = nil
-        return .cancel(id: CancelId())
+        return .cancel(id: CancelId.self)
 
       case let .setNavigationSelectionDelayCompleted(id):
         state.rows[id: id]?.isActivityIndicatorVisible = false

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Lists-NavigateAndLoad.swift

@@ -48,7 +48,7 @@ let navigateAndLoadListReducer =
       NavigateAndLoadListState, NavigateAndLoadListAction, NavigateAndLoadListEnvironment
     > { state, action, environment in
 
-      struct CancelId: Hashable {}
+      enum CancelId {}
 
       switch action {
       case .counter:
@@ -59,14 +59,14 @@ let navigateAndLoadListReducer =
 
         return Effect(value: .setNavigationSelectionDelayCompleted)
           .delay(1, on: environment.mainQueue)
-          .cancellable(id: CancelId())
+          .cancellable(id: CancelId.self)
 
       case .setNavigation(selection: .none):
         if let selection = state.selection, let count = selection.value?.count {
           state.rows[id: selection.id]?.count = count
         }
         state.selection = nil
-        return .cancel(id: CancelId())
+        return .cancel(id: CancelId.self)
 
       case .setNavigationSelectionDelayCompleted:
         guard let id = state.selection?.id else { return .none }

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-LoadThenNavigate.swift

@@ -41,18 +41,17 @@ let loadThenNavigateReducer =
       LoadThenNavigateState, LoadThenNavigateAction, LoadThenNavigateEnvironment
     > { state, action, environment in
 
-      struct CancelId: Hashable {}
+      enum CancelId {}
 
       switch action {
-
       case .onDisappear:
-        return .cancel(id: CancelId())
+        return .cancel(id: CancelId.self)
 
       case .setNavigation(isActive: true):
         state.isActivityIndicatorVisible = true
         return Effect(value: .setNavigationIsActiveDelayCompleted)
           .delay(1, on: environment.mainQueue)
-          .cancellable(id: CancelId())
+          .cancellable(id: CancelId.self)
 
       case .setNavigation(isActive: false):
         state.optionalCounter = nil

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-NavigateAndLoad.swift

@@ -38,18 +38,20 @@ let navigateAndLoadReducer =
     with: Reducer<
       NavigateAndLoadState, NavigateAndLoadAction, NavigateAndLoadEnvironment
     > { state, action, environment in
-      struct CancelId: Hashable {}
+
+      enum CancelId {}
+
       switch action {
       case .setNavigation(isActive: true):
         state.isNavigationActive = true
         return Effect(value: .setNavigationIsActiveDelayCompleted)
           .delay(1, on: environment.mainQueue)
-          .cancellable(id: CancelId())
+          .cancellable(id: CancelId.self)
 
       case .setNavigation(isActive: false):
         state.isNavigationActive = false
         state.optionalCounter = nil
-        return .cancel(id: CancelId())
+        return .cancel(id: CancelId.self)
 
       case .setNavigationIsActiveDelayCompleted:
         state.optionalCounter = CounterState()

Examples/CaseStudies/SwiftUICaseStudies/03-Navigation-Sheet-LoadThenPresent.swift

@@ -41,18 +41,17 @@ let loadThenPresentReducer =
       LoadThenPresentState, LoadThenPresentAction, LoadThenPresentEnvironment
     > { state, action, environment in
 
-      struct CancelId: Hashable {}
+      enum CancelId {}
 
       switch action {
-
       case .onDisappear:
-        return .cancel(id: CancelId())
+        return .cancel(id: CancelId.self)
 
       case .setSheet(isPresented: true):
         state.isActivityIndicatorVisible = true
         return Effect(value: .setSheetIsPresentedDelayCompleted)
           .delay(1, on: environment.mainQueue)
-          .cancellable(id: CancelId())
+          .cancellable(id: CancelId.self)
 
       case .setSheet(isPresented: false):
         state.optionalCounter = nil