@@ -287,7 +287,7 @@ extension SortedArray {
287
287
public func firstIndex( where predicate: ( Element ) throws -> Bool ) rethrows -> Index ? {
288
288
var match : Index ? = nil
289
289
if case let . found( m) = try searchFirst ( where: predicate) {
290
- match = m
290
+ match = m
291
291
}
292
292
return match
293
293
}
@@ -303,8 +303,8 @@ extension SortedArray {
303
303
///
304
304
/// - Complexity: O(_log(n)_), where _n_ is the size of the array.
305
305
public func first( where predicate: ( Element ) throws -> Bool ) rethrows -> Element ? {
306
- guard let index = try firstIndex ( where: predicate) else { return nil }
307
- return self [ index]
306
+ guard let index = try firstIndex ( where: predicate) else { return nil }
307
+ return self [ index]
308
308
}
309
309
310
310
/// Returns the first index where the specified value appears in the collection.
@@ -394,7 +394,7 @@ extension SortedArray {
394
394
public func lastIndex( where predicate: ( Element ) throws -> Bool ) rethrows -> Index ? {
395
395
var match : Index ? = nil
396
396
if case let . found( m) = try searchLast ( where: predicate) {
397
- match = m
397
+ match = m
398
398
}
399
399
return match
400
400
}
@@ -410,8 +410,8 @@ extension SortedArray {
410
410
///
411
411
/// - Complexity: O(_log(n)_), where _n_ is the size of the array.
412
412
public func last( where predicate: ( Element ) throws -> Bool ) rethrows -> Element ? {
413
- guard let index = try firstIndex ( where: predicate) else { return nil }
414
- return self [ index]
413
+ guard let index = try firstIndex ( where: predicate) else { return nil }
414
+ return self [ index]
415
415
}
416
416
}
417
417
@@ -508,15 +508,15 @@ extension SortedArray {
508
508
fileprivate func searchFirst( where predicate: ( Element ) throws -> Bool , in range: Range < Index > ) rethrows -> Match < Index > {
509
509
guard let middle = range. middle else { return . notFound( insertAt: range. upperBound) }
510
510
if try predicate ( self [ middle] ) {
511
- if middle == 0 {
512
- return . found( at: middle)
513
- } else if !( try predicate ( self [ index ( before: middle) ] ) ) {
514
- return . found( at: middle)
515
- } else {
516
- return try searchFirst ( where: predicate, in: range. lowerBound ..< middle)
517
- }
511
+ if middle == 0 {
512
+ return . found( at: middle)
513
+ } else if !( try predicate ( self [ index ( before: middle) ] ) ) {
514
+ return . found( at: middle)
515
+ } else {
516
+ return try searchFirst ( where: predicate, in: range. lowerBound ..< middle)
517
+ }
518
518
} else {
519
- return try searchFirst ( where: predicate, in: index ( after: middle) ..< range. upperBound)
519
+ return try searchFirst ( where: predicate, in: index ( after: middle) ..< range. upperBound)
520
520
}
521
521
}
522
522
@@ -547,15 +547,15 @@ extension SortedArray {
547
547
fileprivate func searchLast( where predicate: ( Element ) throws -> Bool , in range: Range < Index > ) rethrows -> Match < Index > {
548
548
guard let middle = range. middle else { return . notFound( insertAt: range. upperBound) }
549
549
if try predicate ( self [ middle] ) {
550
- if middle == range. upperBound - 1 {
551
- return . found( at: middle)
552
- } else if !( try predicate ( self [ index ( after: middle) ] ) ) {
553
- return . found( at: middle)
554
- } else {
555
- return try searchLast ( where: predicate, in: index ( after: middle) ..< range. upperBound)
556
- }
550
+ if middle == range. upperBound - 1 {
551
+ return . found( at: middle)
552
+ } else if !( try predicate ( self [ index ( after: middle) ] ) ) {
553
+ return . found( at: middle)
554
+ } else {
555
+ return try searchLast ( where: predicate, in: index ( after: middle) ..< range. upperBound)
556
+ }
557
557
} else {
558
- return try searchLast ( where: predicate, in: range. lowerBound ..< middle)
558
+ return try searchLast ( where: predicate, in: range. lowerBound ..< middle)
559
559
}
560
560
}
561
561
}
0 commit comments