[SE-0121] remove use of optional comparison operators

jtbandes · jtbandes · commit 97a830b38e58 · 2016-07-22T00:57:45.000-07:00
diff --git a/Foundation/IndexSet.swift b/Foundation/IndexSet.swift
@@ -432,12 +432,12 @@ public struct IndexSet : ReferenceConvertible, Equatable, BidirectionalCollectio
     ///
     /// - parameter range: The range of integers to include.
     public func indexRange(in range: Range<Element>) -> Range<Index> {
-        if range.isEmpty {
+        if isEmpty || range.isEmpty {
             let i = Index(indexSet: self, index: 0)
             return i..<i
         }
         
-        if range.lowerBound > last || (range.upperBound - 1) < first {
+        if range.lowerBound > last! || (range.upperBound - 1) < first! {
             let i = Index(indexSet: self, index: 0)
             return i..<i
         }

Original file line number	Diff line number	Diff line change
`@@ -432,12 +432,12 @@ public struct IndexSet : ReferenceConvertible, Equatable, BidirectionalCollectio`
`432`	`432`	`///`
`433`	`433`	`/// - parameter range: The range of integers to include.`
`434`	`434`	`public func indexRange(in range: Range<Element>) -> Range<Index> {`
`435`		`- if range.isEmpty {`
	`435`	`+ if isEmpty \|\| range.isEmpty {`
`436`	`436`	`let i = Index(indexSet: self, index: 0)`
`437`	`437`	`return i..<i`
`438`	`438`	`}`
`439`	`439`
`440`		`- if range.lowerBound > last \|\| (range.upperBound - 1) < first {`
	`440`	`+ if range.lowerBound > last! \|\| (range.upperBound - 1) < first! {`
`441`	`441`	`let i = Index(indexSet: self, index: 0)`
`442`	`442`	`return i..<i`
`443`	`443`	`}`