Swift 3.0 simplifications.

Author: kzaher

Sources/DataSources/Array+Extensions.swift

@@ -12,18 +12,18 @@ import Foundation
 
 extension Array where Element: SectionModelType {
     mutating func moveFromSourceIndexPath(_ sourceIndexPath: IndexPath, destinationIndexPath: IndexPath) {
-        let sourceSection = self[(sourceIndexPath as NSIndexPath).section]
+        let sourceSection = self[sourceIndexPath.section]
         var sourceItems = sourceSection.items
 
-        let sourceItem = sourceItems.remove(at: (sourceIndexPath as NSIndexPath).item)
+        let sourceItem = sourceItems.remove(at: sourceIndexPath.item)
 
         let sourceSectionNew = Element(original: sourceSection, items: sourceItems)
-        self[(sourceIndexPath as NSIndexPath).section] = sourceSectionNew
+        self[sourceIndexPath.section] = sourceSectionNew
 
-        let destinationSection = self[(destinationIndexPath as NSIndexPath).section]
+        let destinationSection = self[destinationIndexPath.section]
         var destinationItems = destinationSection.items
-        destinationItems.insert(sourceItem, at: (destinationIndexPath as NSIndexPath).item)
+        destinationItems.insert(sourceItem, at: destinationIndexPath.item)
 
-        self[(destinationIndexPath as NSIndexPath).section] = Element(original: destinationSection, items: destinationItems)
+        self[destinationIndexPath.section] = Element(original: destinationSection, items: destinationItems)
     }
 }

Sources/DataSources/CollectionViewSectionedDataSource.swift

@@ -186,7 +186,7 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>
     }
 
     override func _rx_collectionView(_ collectionView: UICollectionView, cellForItemAtIndexPath indexPath: IndexPath) -> UICollectionViewCell {
-        precondition((indexPath as NSIndexPath).item < _sectionModels[(indexPath as NSIndexPath).section].items.count)
+        precondition(indexPath.item < _sectionModels[indexPath.section].items.count)
 
         return configureCell(self, collectionView, indexPath, itemAtIndexPath(indexPath))
     }

Sources/DataSources/TableViewSectionedDataSource.swift

@@ -77,13 +77,11 @@ public class _TableViewSectionedDataSource
     func _sectionIndexTitlesForTableView(_ tableView: UITableView) -> [String]? {
         return nil
     }
-
+    
     public func sectionIndexTitles(for tableView: UITableView) -> [String]? {
         return _sectionIndexTitlesForTableView(tableView)
     }
-    #endif
 
-    #if os(iOS)
     func _rx_tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, atIndex index: Int) -> Int {
         return 0
     }
@@ -142,13 +140,13 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
     }
 
     public func itemAtIndexPath(_ indexPath: IndexPath) -> I {
-        return self._sectionModels[(indexPath as NSIndexPath).section].items[(indexPath as NSIndexPath).item]
+        return self._sectionModels[indexPath.section].items[indexPath.item]
     }
 
     public func setItem(item: I, indexPath: IndexPath) {
-        var section = self._sectionModels[(indexPath as NSIndexPath).section]
-        section.items[(indexPath as NSIndexPath).item] = item
-        self._sectionModels[(indexPath as NSIndexPath).section] = section
+        var section = self._sectionModels[indexPath.section]
+        section.items[indexPath.item] = item
+        self._sectionModels[indexPath.section] = section
     }
 
     public func modelAtIndexPath(_ indexPath: IndexPath) throws -> Any {
@@ -238,7 +236,7 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
     }
 
     override func _rx_tableView(_ tableView: UITableView, cellForRowAtIndexPath indexPath: IndexPath) -> UITableViewCell {
-        precondition((indexPath as NSIndexPath).item < _sectionModels[(indexPath as NSIndexPath).section].items.count)
+        precondition(indexPath.item < _sectionModels[indexPath.section].items.count)
 
         return configureCell(self, tableView, indexPath, itemAtIndexPath(indexPath))
     }
@@ -288,5 +286,4 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
         return section
     }
     #endif
-    
 }