@@ -12,22 +12,17 @@ func checkMatch<S: Collection, T: Collection>(_ x: S, _ y: T, _ i: S.Index)
1212 expectEqual ( x [ i] , y [ i] )
1313}
1414
15- func checkMatchContiguousStorage< S: Collection , T: Collection > ( _ x: S , _ y: T , expected : Bool )
15+ func checkMatchContiguousStorage< S: Collection , T: Collection > ( _ x: S , _ y: T )
1616 where S. Element == T . Element , S. Element: Equatable
1717{
1818 let xElement = x. withContiguousStorageIfAvailable { $0. first }
1919 let yElement = y. withContiguousStorageIfAvailable { $0. first }
2020
21- if expected {
22- expectEqual ( xElement, yElement)
23- } else {
24- expectNotEqual ( xElement, yElement)
25- }
21+ expectEqual ( xElement, yElement)
2622}
2723
28- func checkHasContiguousStorage< S: Collection > ( _ x: S , expected: Bool ) {
29- let hasStorage = x. withContiguousStorageIfAvailable { _ in true } ?? false
30- expectEqual ( hasStorage, expected)
24+ func checkHasContiguousStorage< S: Collection > ( _ x: S ) {
25+ expectTrue ( x. withContiguousStorageIfAvailable { _ in true } ?? false )
3126}
3227
3328func checkHasContiguousStorageSubstring( _ x: Substring . UTF8View ) {
@@ -252,21 +247,21 @@ SubstringTests.test("UTF8View") {
252247 expectEqual ( " " , String ( u. dropFirst ( 100 ) ) !)
253248 expectEqual ( " " , String ( u. dropLast ( 100 ) ) !)
254249
255- checkHasContiguousStorage ( s. utf8, expected: true ) // Strings always do
250+
251+ checkHasContiguousStorage ( s. utf8) // Strings always do
256252 checkHasContiguousStorageSubstring ( t)
257253 checkHasContiguousStorageSubstring ( u)
258- checkMatchContiguousStorage ( Array ( s. utf8) , s. utf8, expected : true )
254+ checkMatchContiguousStorage ( Array ( s. utf8) , s. utf8)
259255
260256 // The specialization for Substring.withContiguousStorageIfAvailable was
261257 // added in https://github.com/apple/swift/pull/29146.
262258 guard #available( macOS 9999 , iOS 9999 , watchOS 9999 , tvOS 9999 , * ) else {
263259 return
264260 }
265-
266- checkHasContiguousStorage ( t, expected: true )
267- checkHasContiguousStorage ( u, expected: true )
268- checkMatchContiguousStorage ( Array ( t) , t, expected: true )
269- checkMatchContiguousStorage ( Array ( u) , u, expected: true )
261+ checkHasContiguousStorage ( t)
262+ checkHasContiguousStorage ( u)
263+ checkMatchContiguousStorage ( Array ( t) , t)
264+ checkMatchContiguousStorage ( Array ( u) , u)
270265 }
271266}
272267
0 commit comments