Route enum cases without associated values

spotify · May 31, 2022 · d2ff1e6 · d2ff1e6
1 parent 2170f40
commit d2ff1e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/MobiusCore/Source/EffectHandlers/EnumRoute.swift b/MobiusCore/Source/EffectHandlers/EnumRoute.swift
@@ -19,22 +19,21 @@ public extension EffectRouter {
         _ enumCase: @escaping (EffectParameters) -> Effect
     ) -> _PartialEffectRouter<Effect, EffectParameters, Event> {
         let casePath = /enumCase
-        return routeEffects(withParameters: { effect in
-            casePath.extract(from: effect)
-        })
+        return routeEffects(withParameters: casePath.extract)
+    }
+
+    func routeCase(
+        _ enumCase: Effect
+    ) -> _PartialEffectRouter<Effect, Void, Event> {
+        let casePath = /enumCase
+        return routeEffects(withParameters: casePath.extract)
     }
 }
 
 public extension EffectRouter where Effect: Equatable {
     func routeCase(
         _ enumCase: Effect
     ) -> _PartialEffectRouter<Effect, Void, Event> {
-        return routeEffects(withParameters: { effect in
-            if enumCase == effect {
-                return ()
-            } else {
-                return nil
-            }
-        })
+        return routeEffects(withParameters: { effect in effect == enumCase ? () : nil })
     }
 }
diff --git a/MobiusCore/Test/EffectHandlers/EnumRouteTests.swift b/MobiusCore/Test/EffectHandlers/EnumRouteTests.swift
@@ -20,7 +20,7 @@ import Quick
 
 private typealias Event = ()
 
-private enum Effect: Equatable {
+private enum Effect {
     case justEffect
     case effectWithString(String)
     case effectWithTuple(left: String, right: Int)