Moves protocol conformance noise into their own extensions.

Author: kzaher

Sources/DataSources/AnimatableSectionModel.swift

@@ -8,35 +8,42 @@
 
 import Foundation
 
-public struct AnimatableSectionModel<Section: IdentifiableType, ItemType: IdentifiableType & Equatable>
-    : AnimatableSectionModelType
-    , CustomStringConvertible {
-    public typealias Item = ItemType
-    public typealias Identity = Section.Identity
-
+public struct AnimatableSectionModel<Section: IdentifiableType, ItemType: IdentifiableType & Equatable> {
     public var model: Section
-    
     public var items: [Item]
 
-    public var identity: Section.Identity {
-        return model.identity
-    }
-    
     public init(model: Section, items: [ItemType]) {
         self.model = model
         self.items = items
     }
 
+}
+
+extension AnimatableSectionModel
+    : AnimatableSectionModelType {
+    public typealias Item = ItemType
+    public typealias Identity = Section.Identity
+
+    public var identity: Section.Identity {
+        return model.identity
+    }
+
     public init(original: AnimatableSectionModel, items: [Item]) {
         self.model = original.model
         self.items = items
     }
 
-    public var description: String {
-        return "HashableSectionModel(model: \"\(self.model)\", items: \(items))"
-    }
-    
     public var hashValue: Int {
         return self.model.identity.hashValue
     }
 }
+
+
+extension AnimatableSectionModel
+    : CustomStringConvertible {
+
+    public var description: String {
+        return "HashableSectionModel(model: \"\(self.model)\", items: \(items))"
+    }
+
+}

Sources/DataSources/IdentifiableValue.swift

@@ -8,18 +8,24 @@
 
 import Foundation
 
-public struct IdentifiableValue<Value: Hashable>
-    : IdentifiableType
-    , Equatable
-    , CustomStringConvertible
-    , CustomDebugStringConvertible {
-    public typealias Identity = Value
-
+public struct IdentifiableValue<Value: Hashable> {
     public let value: Value
+}
+
+extension IdentifiableValue
+    : IdentifiableType {
+
+    public typealias Identity = Value
 
     public var identity : Identity {
         return value
     }
+}
+
+extension IdentifiableValue
+    : Equatable
+    , CustomStringConvertible
+    , CustomDebugStringConvertible {
 
     public var description: String {
         return "\(value)"
@@ -32,4 +38,4 @@ public struct IdentifiableValue<Value: Hashable>
 
 public func == <V: Hashable>(lhs: IdentifiableValue<V>, rhs: IdentifiableValue<V>) -> Bool {
     return lhs.value == rhs.value
-}
+}

Sources/DataSources/SectionModel.swift

@@ -8,23 +8,28 @@
 
 import Foundation
 
-public struct SectionModel<Section, ItemType>
-    : SectionModelType
-    , CustomStringConvertible {
-    public typealias Identity = Section
-    public typealias Item = ItemType
+public struct SectionModel<Section, ItemType> {
     public var model: Section
-
-    public var identity: Section {
-        return model
-    }
-
     public var items: [Item]
 
     public init(model: Section, items: [Item]) {
         self.model = model
         self.items = items
     }
+}
+
+extension SectionModel
+    : SectionModelType {
+    public typealias Identity = Section
+    public typealias Item = ItemType
+    
+    public var identity: Section {
+        return model
+    }
+}
+
+extension SectionModel
+    : CustomStringConvertible {
 
     public var description: String {
         return "\(self.model) > \(items)"
@@ -36,4 +41,4 @@ extension SectionModel {
         self.model = original.model
         self.items = items
     }
-}
+}