Merge branch 'master' into remove

Author: ole

Sources/SortedArray.swift

@@ -106,8 +106,11 @@ extension SortedArray: RandomAccessCollection {
         return _elements[position]
     }
 
+    /// Like `Sequence.filter(_:)`, but returns a `SortedArray` instead of an `Array`.
+    /// We can do this efficiently because filtering doesn't change the sort order.
     public func filter(_ isIncluded: (Element) throws -> Bool) rethrows -> SortedArray<Element> {
-        return SortedArray(sorted: try filter(isIncluded), areInIncreasingOrder: areInIncreasingOrder)
+        let newElements = try _elements.filter(isIncluded)
+        return SortedArray(sorted: newElements, areInIncreasingOrder: areInIncreasingOrder)
     }
 }
 
@@ -145,15 +148,15 @@ extension SortedArray {
     /// - Complexity: O(1).
     @warn_unqualified_access
     public func min() -> Element? {
-        return _elements.first
+        return first
     }
 
     /// Returns the maximum element in the sequence.
     ///
     /// - Complexity: O(1).
     @warn_unqualified_access
     public func max() -> Element? {
-        return _elements.last
+        return last
     }
 }
 

Tests/SortedArrayTests/SortedArrayTests.swift

@@ -202,6 +202,7 @@ extension SortedArrayTests {
             ("testMax", testMax),
             ("testCustomStringConvertible", testCustomStringConvertible),
             ("testCustomDebugStringConvertible", testCustomDebugStringConvertible),
+            ("testFilter", testFilter),
             ("testRemoveAtBeginningPreservesSortOrder", testRemoveAtBeginningPreservesSortOrder),
             ("testRemoveInMiddlePreservesSortOrder", testRemoveInMiddlePreservesSortOrder),
             ("testRemoveAtEndPreservesSortOrder", testRemoveAtEndPreservesSortOrder),