Removes redundant conformances.

kzaher · kzaher · commit 9fc634c07a28 · 2017-07-15T20:45:05.000+02:00
diff --git a/RxExample/RxDataSources/DataSources/AnimatableSectionModelType.swift b/RxExample/RxDataSources/DataSources/AnimatableSectionModelType.swift
@@ -10,6 +10,6 @@ import Foundation
 
 public protocol AnimatableSectionModelType
     : SectionModelType
-    , IdentifiableType {
-    associatedtype Item : IdentifiableType, Equatable
-}
+    , IdentifiableType where Item: IdentifiableType, Item: Equatable {
+
+}
diff --git a/RxExample/RxDataSources/DataSources/IdentifiableValue.swift b/RxExample/RxDataSources/DataSources/IdentifiableValue.swift
@@ -30,6 +30,6 @@ public struct IdentifiableValue<Value: Hashable>
     }
 }
 
-public func == <V: Hashable>(lhs: IdentifiableValue<V>, rhs: IdentifiableValue<V>) -> Bool {
+public func == <V>(lhs: IdentifiableValue<V>, rhs: IdentifiableValue<V>) -> Bool {
     return lhs.value == rhs.value
-}
+}
diff --git a/RxExample/RxDataSources/DataSources/UI+SectionedViewType.swift b/RxExample/RxDataSources/DataSources/UI+SectionedViewType.swift
@@ -91,7 +91,7 @@ extension UICollectionView : SectionedViewType {
         self.reloadSections(indexSet(sections))
     }
     
-  public func performBatchUpdates<S: SectionModelType>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration) {
+  public func performBatchUpdates<S>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration) {
         self.performBatchUpdates({ () -> Void in
             _performBatchUpdates(self, changes: changes, animationConfiguration: animationConfiguration)
         }, completion: { (completed: Bool) -> Void in
@@ -113,7 +113,7 @@ public protocol SectionedViewType {
     func performBatchUpdates<S>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration)
 }
 
-func _performBatchUpdates<V: SectionedViewType, S: SectionModelType>(_ view: V, changes: Changeset<S>, animationConfiguration:AnimationConfiguration) {
+func _performBatchUpdates<V: SectionedViewType, S>(_ view: V, changes: Changeset<S>, animationConfiguration:AnimationConfiguration) {
     typealias I = S.Item
   
     view.deleteSections(changes.deletedSections, animationStyle: animationConfiguration.deleteAnimation)
diff --git a/RxExample/RxExample/Operators.swift b/RxExample/RxExample/Operators.swift
@@ -38,7 +38,7 @@ func nonMarkedText(_ textInput: UITextInput) -> String? {
     return (textInput.text(in: startRange) ?? "") + (textInput.text(in: endRange) ?? "")
 }
 
-func <-> <Base: UITextInput>(textInput: TextInput<Base>, variable: Variable<String>) -> Disposable {
+func <-> <Base>(textInput: TextInput<Base>, variable: Variable<String>) -> Disposable {
     let bindToUIDisposable = variable.asObservable()
         .bind(to: textInput.text)
     let bindToVariable = textInput.text

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ public struct IdentifiableValue<Value: Hashable>`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-public func == <V: Hashable>(lhs: IdentifiableValue<V>, rhs: IdentifiableValue<V>) -> Bool {`
	`33`	`+public func == <V>(lhs: IdentifiableValue<V>, rhs: IdentifiableValue<V>) -> Bool {`
`34`	`34`	`return lhs.value == rhs.value`
`35`		`-}`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ extension UICollectionView : SectionedViewType {`
`91`	`91`	`self.reloadSections(indexSet(sections))`
`92`	`92`	`}`
`93`	`93`
`94`		`- public func performBatchUpdates<S: SectionModelType>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration) {`
	`94`	`+ public func performBatchUpdates<S>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration) {`
`95`	`95`	`self.performBatchUpdates({ () -> Void in`
`96`	`96`	`_performBatchUpdates(self, changes: changes, animationConfiguration: animationConfiguration)`
`97`	`97`	`}, completion: { (completed: Bool) -> Void in`
`@@ -113,7 +113,7 @@ public protocol SectionedViewType {`
`113`	`113`	`func performBatchUpdates<S>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration)`
`114`	`114`	`}`
`115`	`115`
`116`		`-func _performBatchUpdates<V: SectionedViewType, S: SectionModelType>(_ view: V, changes: Changeset<S>, animationConfiguration:AnimationConfiguration) {`
	`116`	`+func _performBatchUpdates<V: SectionedViewType, S>(_ view: V, changes: Changeset<S>, animationConfiguration:AnimationConfiguration) {`
`117`	`117`	`typealias I = S.Item`
`118`	`118`
`119`	`119`	`view.deleteSections(changes.deletedSections, animationStyle: animationConfiguration.deleteAnimation)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func nonMarkedText(_ textInput: UITextInput) -> String? {`
`38`	`38`	`return (textInput.text(in: startRange) ?? "") + (textInput.text(in: endRange) ?? "")`
`39`	`39`	`}`
`40`	`40`
`41`		`-func <-> <Base: UITextInput>(textInput: TextInput<Base>, variable: Variable<String>) -> Disposable {`
	`41`	`+func <-> <Base>(textInput: TextInput<Base>, variable: Variable<String>) -> Disposable {`
`42`	`42`	`let bindToUIDisposable = variable.asObservable()`
`43`	`43`	`.bind(to: textInput.text)`
`44`	`44`	`let bindToVariable = textInput.text`