Merge pull request #28 from mjarvis/swift_deprecations

Update code to conform to swift 2.2 deprecations
ReSwift · Jun 8, 2016 · 5c5d850 · 5c5d850
2 parents 2af0cc9 + cdb3fe1
commit 5c5d850
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/ReSwiftRouter/NavigationReducer.swift b/ReSwiftRouter/NavigationReducer.swift
@@ -31,19 +31,23 @@ public struct NavigationReducer {
         return state
     }
 
-    static func setRoute(var state: NavigationState, setRouteAction: SetRouteAction) -> NavigationState {
+    static func setRoute(state: NavigationState, setRouteAction: SetRouteAction) -> NavigationState {
+        var state = state
+
         state.route = setRouteAction.route
         state.changeRouteAnimated = setRouteAction.animated
 
         return state
     }
 
     static func setRouteSpecificData(
-        var state: NavigationState,
+        state: NavigationState,
         route: Route,
         data: Any) -> NavigationState{
             let routeHash = RouteHash(route: route)
 
+            var state = state
+
             state.routeSpecificState[routeHash] = data
 
             return state

diff --git a/ReSwiftRouter/Router.swift b/ReSwiftRouter/Router.swift
@@ -105,7 +105,7 @@ public class Router<State: StateType>: StoreSubscriber {
             while largestCommonSubroute + 1 < newRoute.count &&
                   largestCommonSubroute + 1 < oldRoute.count &&
                   newRoute[largestCommonSubroute + 1] == oldRoute[largestCommonSubroute + 1] {
-                    largestCommonSubroute++
+                    largestCommonSubroute += 1
             }
 
             return largestCommonSubroute
@@ -153,7 +153,7 @@ public class Router<State: StateType>: StoreSubscriber {
                 )
 
                 routingActions.append(popAction)
-                routeBuildingIndex--
+                routeBuildingIndex -= 1
             }
 
             // This is the 1. case:
@@ -166,7 +166,7 @@ public class Router<State: StateType>: StoreSubscriber {
                 )
 
                 routingActions.append(popAction)
-                routeBuildingIndex--
+                routeBuildingIndex -= 1
             }
             // This is the 3. case:
             // "The new route has a different element after the commonSubroute, we need to replace
@@ -195,7 +195,7 @@ public class Router<State: StateType>: StoreSubscriber {
                 )
 
                 routingActions.append(pushAction)
-                routeBuildingIndex++
+                routeBuildingIndex += 1
             }
 
             return routingActions