Fix segmentation faults in Xcode 7.3 (swift 2.2)

Author: Damien Rambout

Sources/DataSources/CollectionViewSectionedDataSource.swift

@@ -142,13 +142,18 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>
     }
 
     override func _collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {
-        return canMoveItemAtIndexPath?(self, indexPath: indexPath) ??
-            super._collectionView(collectionView, canMoveItemAtIndexPath: indexPath)
+        guard let canMoveItem = canMoveItemAtIndexPath?(self, indexPath: indexPath) else {
+            return super._collectionView(collectionView, canMoveItemAtIndexPath: indexPath)
+        }
+        
+        return canMoveItem
     }
 
     override func _collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {
-        return moveItem?(self, sourceIndexPath:sourceIndexPath, destinationIndexPath: destinationIndexPath) ??
+        guard let _ = moveItem?(self, sourceIndexPath:sourceIndexPath, destinationIndexPath: destinationIndexPath) else {
             super._collectionView(collectionView, moveItemAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)
+            return
+        }
     }
 
 }

Sources/DataSources/TableViewSectionedDataSource.swift

@@ -177,22 +177,35 @@ public class RxTableViewSectionedDataSource<S: SectionModelType>
     }
 
     override func _tableView(tableView: UITableView, canEditRowAtIndexPath indexPath: NSIndexPath) -> Bool {
-        return canEditRowAtIndexPath?(self, indexPath: indexPath) ??
-            super._tableView(tableView, canMoveRowAtIndexPath: indexPath)
+        guard let canEditRow = canEditRowAtIndexPath?(self, indexPath: indexPath) else {
+            return super._tableView(tableView, canMoveRowAtIndexPath: indexPath)
+        }
+        
+        return canEditRow
     }
 
     override func _tableView(tableView: UITableView, canMoveRowAtIndexPath indexPath: NSIndexPath) -> Bool {
-        return canMoveRowAtIndexPath?(self, indexPath: indexPath) ??
-            super._tableView(tableView, canMoveRowAtIndexPath: indexPath)
+        guard let canMoveRow = canMoveRowAtIndexPath?(self, indexPath: indexPath) else {
+            return super._tableView(tableView, canMoveRowAtIndexPath: indexPath)
+        }
+        
+        return canMoveRow
     }
 
     override func _sectionIndexTitlesForTableView(tableView: UITableView) -> [String]? {
-        return sectionIndexTitles?(self) ?? super._sectionIndexTitlesForTableView(tableView)
+        guard let titles = sectionIndexTitles?(self) else {
+            return super._sectionIndexTitlesForTableView(tableView)
+        }
+        
+        return titles
     }
 
     override func _tableView(tableView: UITableView, sectionForSectionIndexTitle title: String, atIndex index: Int) -> Int {
-        return sectionForSectionIndexTitle?(self, title: title, index: index) ??
-            super._tableView(tableView, sectionForSectionIndexTitle: title, atIndex: index)
+        guard let section  = sectionForSectionIndexTitle?(self, title: title, index: index) else {
+            return super._tableView(tableView, sectionForSectionIndexTitle: title, atIndex: index)
+        }
+        
+        return section
     }
 
 }