Merge pull request #38 from nghialv/swift2.2

swift 2.2

Hakuba/ArrayExt.swift

@@ -25,15 +25,15 @@ extension Array {
     func getSafeRange(range: Range<Int>) -> Range<Int>? {
         let start = max(0, range.startIndex)
         let end = min(count, range.endIndex)
-        return start <= end ? Range<Int>(start: start, end: end) : nil
+        return start <= end ? start..<end : nil
     }
 
     func get(index: Int) -> Element? {
         return hasIndex(index) ? self[index] : nil
     }
 
     mutating func append(newArray: Array) -> Range<Int> {
-        let range = Range<Int>(start: count, end: count + newArray.count)
+        let range = count..<(count + newArray.count)
         self += newArray
         return range
     }
@@ -46,7 +46,7 @@ extension Array {
         let left = self[0..<start]
         let right = self[start..<count]
         self = left + newArray + right
-        return Range<Int>(start: start, end: end)
+        return start..<end
     }
 
     mutating func move(fromIndex from: Int, toIndex to: Int) -> Bool {
@@ -67,7 +67,7 @@ extension Array {
             return nil
         }
         removeAtIndex(index)
-        return Range<Int>(start: index, end: index + 1)
+        return index..<(index + 1)
     }
 
     mutating func remove(range: Range<Int>) -> Range<Int>? {

Hakuba/CellType.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 public protocol CellType {
-    typealias CellModel
+    associatedtype CellModel
 
     var cellmodel: CellModel? { get }
 }

Hakuba/Hakuba.swift

@@ -231,7 +231,7 @@ public extension Hakuba {
 
         for j in 0..<sectionsCount {
             if let k = sortedIndexes.get(i) where k == j {
-                i++
+                i += 1
             } else {
                 remainSections.append(sections[j])
             }
@@ -500,9 +500,11 @@ extension Hakuba: UITableViewDataSource {
 // MARK - Private methods
 
 private extension Hakuba {
-    func setupSections(sections: [Section], var fromIndex start: Int) {
+    func setupSections(sections: [Section], fromIndex start: Int) {
+        var start = start
         sections.forEach {
-            $0.setup(start++, delegate: self)
+            $0.setup(start, delegate: self)
+            start += 1
         }
     }
 }

Hakuba/HeaderFooterViewType.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 public protocol HeaderFooterViewType {
-    typealias ViewModel
+    associatedtype ViewModel
 
     var viewmodel: ViewModel? { get }
 }

Hakuba/Section.swift

@@ -142,7 +142,7 @@ public extension Section {
 
         for j in 0..<count {
             if let k = sortedIndexes.get(i) where k == j {
-                i++
+                i += 1
             } else {
                 remainCellmodels.append(cellmodels[j])
             }
@@ -231,14 +231,17 @@ extension Section {
 // MARK - Private methods
 
 private extension Section {
-    func setupCellmodels(cellmodels: [CellModel], var indexFrom start: Int) {
+    func setupCellmodels(cellmodels: [CellModel], indexFrom start: Int) {
         guard let delegate = delegate as? CellModelDelegate else {
             return
         }
 
-        for cellmodel in cellmodels {
-            let indexPath = NSIndexPath(forRow: start++, inSection: index)
+        var start = start
+
+        cellmodels.forEach { cellmodel in
+            let indexPath = NSIndexPath(forRow: start, inSection: index)
             cellmodel.setup(indexPath, delegate: delegate)
+            start += 1
         }
     }
 }