Remove StateType since it isn't really necessary to mark the state with a protocol

Qata · Qata · commit 063eb34bb948 · 2017-03-03T11:37:11.000+11:00
diff --git a/ReactiveReSwift.xcodeproj/project.pbxproj b/ReactiveReSwift.xcodeproj/project.pbxproj
@@ -10,25 +10,21 @@
 		259737FB1C2C618A00869B8F /* TestFakes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 259737FA1C2C618A00869B8F /* TestFakes.swift */; };
 		25DBCF401C30C16000D63A58 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B61C1FFC880027C288 /* Action.swift */; };
 		25DBCF421C30C16000D63A58 /* Reducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B81C1FFC880027C288 /* Reducer.swift */; };
-		25DBCF431C30C16000D63A58 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B91C1FFC880027C288 /* State.swift */; };
 		25DBCF571C30C19500D63A58 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B61C1FFC880027C288 /* Action.swift */; };
 		25DBCF591C30C19500D63A58 /* Reducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B81C1FFC880027C288 /* Reducer.swift */; };
-		25DBCF5A1C30C19500D63A58 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B91C1FFC880027C288 /* State.swift */; };
 		25DBCF691C30C1AC00D63A58 /* ReactiveReSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25DBCF4E1C30C18D00D63A58 /* ReactiveReSwift.framework */; };
 		25DBCF731C30C34000D63A58 /* ReducerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621C06851C277759008029AE /* ReducerTests.swift */; };
 		25DBCF751C30C34000D63A58 /* TestFakes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 259737FA1C2C618A00869B8F /* TestFakes.swift */; };
 		25DBCF8C1C30C4DB00D63A58 /* ReactiveReSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25DBCF7B1C30C4AA00D63A58 /* ReactiveReSwift.framework */; };
 		25DBCF931C30C4F000D63A58 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B61C1FFC880027C288 /* Action.swift */; };
 		25DBCF951C30C4F000D63A58 /* Reducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B81C1FFC880027C288 /* Reducer.swift */; };
-		25DBCF961C30C4F000D63A58 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B91C1FFC880027C288 /* State.swift */; };
 		25DBCF9E1C30C50000D63A58 /* ReducerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621C06851C277759008029AE /* ReducerTests.swift */; };
 		25DBCFA01C30C50000D63A58 /* TestFakes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 259737FA1C2C618A00869B8F /* TestFakes.swift */; };
 		621C06861C277759008029AE /* ReducerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621C06851C277759008029AE /* ReducerTests.swift */; };
 		625E66871C1FF97E0027C288 /* ReactiveReSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 625E66861C1FF97E0027C288 /* ReactiveReSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		625E669F1C1FFA3C0027C288 /* ReactiveReSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 625E66831C1FF97E0027C288 /* ReactiveReSwift.framework */; };
 		625E66BC1C1FFC880027C288 /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B61C1FFC880027C288 /* Action.swift */; };
 		625E66BE1C1FFC880027C288 /* Reducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B81C1FFC880027C288 /* Reducer.swift */; };
-		625E66BF1C1FFC880027C288 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 625E66B91C1FFC880027C288 /* State.swift */; };
 		9E1F6E7E1DDD190B00912955 /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E1F6E7B1DDD190B00912955 /* Store.swift */; };
 		9E1F6E7F1DDD190B00912955 /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E1F6E7B1DDD190B00912955 /* Store.swift */; };
 		9E1F6E801DDD190B00912955 /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E1F6E7B1DDD190B00912955 /* Store.swift */; };
@@ -127,7 +123,6 @@
 		625E669E1C1FFA3C0027C288 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		625E66B61C1FFC880027C288 /* Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Action.swift; sourceTree = "<group>"; };
 		625E66B81C1FFC880027C288 /* Reducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Reducer.swift; sourceTree = "<group>"; };
-		625E66B91C1FFC880027C288 /* State.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = State.swift; sourceTree = "<group>"; };
 		9E1F6E7B1DDD190B00912955 /* Store.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = "<group>"; };
 		9E1F6F251DE7C01F00912955 /* MiddlewareFakes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MiddlewareFakes.swift; sourceTree = "<group>"; };
 		9E1F6F3F1DE7D15200912955 /* StoreDispatchTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StoreDispatchTests.swift; path = Observable/StoreDispatchTests.swift; sourceTree = "<group>"; };
@@ -259,7 +254,6 @@
 				9E1F6FB81DEE810400912955 /* Middleware.swift */,
 				9E1F6E7B1DDD190B00912955 /* Store.swift */,
 				625E66B81C1FFC880027C288 /* Reducer.swift */,
-				625E66B91C1FFC880027C288 /* State.swift */,
 			);
 			path = CoreTypes;
 			sourceTree = "<group>";
@@ -603,7 +597,6 @@
 				9E1F6F921DED0D5400912955 /* SubscriptionReferenceBag.swift in Sources */,
 				25DBCF421C30C16000D63A58 /* Reducer.swift in Sources */,
 				9E1F6FBC1DEE810400912955 /* Middleware.swift in Sources */,
-				25DBCF431C30C16000D63A58 /* State.swift in Sources */,
 				9E1F6F831DED0CB000912955 /* SubscriptionReferenceType.swift in Sources */,
 				9E1F6FA31DED120A00912955 /* StreamType.swift in Sources */,
 				9E1F6F8D1DED0D1100912955 /* ObservablePropertySubscriptionReference.swift in Sources */,
@@ -622,7 +615,6 @@
 				9E1F6F911DED0D5400912955 /* SubscriptionReferenceBag.swift in Sources */,
 				25DBCF591C30C19500D63A58 /* Reducer.swift in Sources */,
 				9E1F6FBB1DEE810400912955 /* Middleware.swift in Sources */,
-				25DBCF5A1C30C19500D63A58 /* State.swift in Sources */,
 				9E1F6F821DED0CB000912955 /* SubscriptionReferenceType.swift in Sources */,
 				9E1F6FA21DED120A00912955 /* StreamType.swift in Sources */,
 				9E1F6F8C1DED0D1100912955 /* ObservablePropertySubscriptionReference.swift in Sources */,
@@ -656,7 +648,6 @@
 				9E1F6F901DED0D5400912955 /* SubscriptionReferenceBag.swift in Sources */,
 				25DBCF951C30C4F000D63A58 /* Reducer.swift in Sources */,
 				9E1F6FBA1DEE810400912955 /* Middleware.swift in Sources */,
-				25DBCF961C30C4F000D63A58 /* State.swift in Sources */,
 				9E1F6F811DED0CB000912955 /* SubscriptionReferenceType.swift in Sources */,
 				9E1F6FA11DED120A00912955 /* StreamType.swift in Sources */,
 				9E1F6F8B1DED0D1100912955 /* ObservablePropertySubscriptionReference.swift in Sources */,
@@ -694,7 +685,6 @@
 				9E1F6F8A1DED0D1100912955 /* ObservablePropertySubscriptionReference.swift in Sources */,
 				9E1F6F851DED0CEA00912955 /* ObservableProperty.swift in Sources */,
 				625E66BE1C1FFC880027C288 /* Reducer.swift in Sources */,
-				625E66BF1C1FFC880027C288 /* State.swift in Sources */,
 				FC15F3FB1E21C72100CF4886 /* Coding.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Sources/CoreTypes/Middleware.swift b/Sources/CoreTypes/Middleware.swift
@@ -10,7 +10,7 @@
  Middleware is a structure that allows you to modify, filter out and dispatch more
  actions, before the action being handled reaches the store.
  */
-public struct Middleware<State: StateType> {
+public struct Middleware<State> {
     public typealias DispatchFunction = (Action...) -> Void
     public typealias GetState = () -> State
 
diff --git a/Sources/CoreTypes/State.swift b/Sources/CoreTypes/State.swift
diff --git a/Sources/CoreTypes/Store.swift b/Sources/CoreTypes/Store.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-open class Store<ObservableProperty: ObservablePropertyType> where ObservableProperty.ValueType: StateType {
+open class Store<ObservableProperty: ObservablePropertyType> {
 
     public typealias StoreMiddleware = Middleware<ObservableProperty.ValueType>
     public typealias StoreReducer = Reducer<ObservableProperty.ValueType>
diff --git a/Tests/Observable/StoreTests.swift b/Tests/Observable/StoreTests.swift
@@ -29,7 +29,7 @@ class ObservableStoreTests: XCTestCase {
 }
 
 // Used for deinitialization test
-class DeInitStore<State: StateType>: Store<ObservableProperty<State>> {
+class DeInitStore<State>: Store<ObservableProperty<State>> {
     var deInitAction: (() -> Void)?
 
     deinit {
diff --git a/Tests/TestFakes.swift b/Tests/TestFakes.swift
@@ -13,15 +13,15 @@ let dispatchQueue = DispatchQueue.global()
 
 struct NoOpAction: Action {}
 
-struct CounterState: StateType {
+struct CounterState {
     var count: Int = 0
 }
 
-struct TestAppState: StateType {
+struct TestAppState {
     var testValue: Int?
 }
 
-struct TestStringAppState: StateType {
+struct TestStringAppState {
     var testValue: String?
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class ObservableStoreTests: XCTestCase {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// Used for deinitialization test`
`32`		`-class DeInitStore<State: StateType>: Store<ObservableProperty<State>> {`
	`32`	`+class DeInitStore<State>: Store<ObservableProperty<State>> {`
`33`	`33`	`var deInitAction: (() -> Void)?`
`34`	`34`
`35`	`35`	`deinit {`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,15 @@ let dispatchQueue = DispatchQueue.global()`
`13`	`13`
`14`	`14`	`struct NoOpAction: Action {}`
`15`	`15`
`16`		`-struct CounterState: StateType {`
	`16`	`+struct CounterState {`
`17`	`17`	`var count: Int = 0`
`18`	`18`	`}`
`19`	`19`
`20`		`-struct TestAppState: StateType {`
	`20`	`+struct TestAppState {`
`21`	`21`	`var testValue: Int?`
`22`	`22`	`}`
`23`	`23`
`24`		`-struct TestStringAppState: StateType {`
	`24`	`+struct TestStringAppState {`
`25`	`25`	`var testValue: String?`
`26`	`26`	`}`
`27`	`27`