@@ -375,8 +375,8 @@ class TestNSString : XCTestCase {
375375
376376 func test_CFStringCreateMutableCopy( ) {
377377 let nsstring : NSString = " абВГ "
378- let mCopy = CFStringCreateMutableCopy ( kCFAllocatorSystemDefault, 0 , unsafeBitCast ( nsstring, CFString . self) )
379- let str = unsafeBitCast ( mCopy, NSString . self) . bridge ( )
378+ let mCopy = CFStringCreateMutableCopy ( kCFAllocatorSystemDefault, 0 , unsafeBitCast ( nsstring, to : CFString . self) )
379+ let str = unsafeBitCast ( mCopy, to : NSString . self) . bridge ( )
380380 XCTAssertEqual ( nsstring. bridge ( ) , str)
381381 }
382382
@@ -388,7 +388,7 @@ class TestNSString : XCTestCase {
388388
389389 let testString = " hello world "
390390 let string = NSString ( string: testString)
391- let cfString = unsafeBitCast ( string, CFString . self)
391+ let cfString = unsafeBitCast ( string, to : CFString . self)
392392
393393 // Get the bytes as UTF16
394394 let reservedLength = 50
@@ -401,7 +401,7 @@ class TestNSString : XCTestCase {
401401
402402 // Make a new string out of it
403403 let newCFString = CFStringCreateWithBytes ( nil , buf, usedLen, CFStringEncoding ( kCFStringEncodingUTF16) , false )
404- let newString = unsafeBitCast ( newCFString, NSString . self)
404+ let newString = unsafeBitCast ( newCFString, to : NSString . self)
405405
406406 XCTAssertTrue ( newString. isEqualToString ( testString) )
407407 }
@@ -598,7 +598,7 @@ class TestNSString : XCTestCase {
598598 }
599599
600600 func test_initializeWithFormat( ) {
601- let argument : [ CVarArgType ] = [ 42 , 42.0 ]
601+ let argument : [ CVarArg ] = [ 42 , 42.0 ]
602602 withVaList ( argument) {
603603 pointer in
604604 let string = NSString ( format: " Value is %d (%.1f) " , arguments: pointer)
@@ -703,7 +703,7 @@ class TestNSString : XCTestCase {
703703
704704 func test_getCString_simple( ) {
705705 let str : NSString = " foo "
706- var chars = [ Int8] ( count : 4 , repeatedValue : 0xF )
706+ var chars = [ Int8] ( repeating : 0xF , count : 4 )
707707 let count = chars. count
708708 let expected : [ Int8 ] = [ 102 , 111 , 111 , 0 ]
709709 var res : Bool = false
@@ -717,7 +717,7 @@ class TestNSString : XCTestCase {
717717
718718 func test_getCString_nonASCII_withASCIIAccessor( ) {
719719 let str : NSString = " ƒoo "
720- var chars = [ Int8] ( count : 5 , repeatedValue : 0xF )
720+ var chars = [ Int8] ( repeating : 0xF , count : 5 )
721721 let expected : [ Int8 ] = [ - 58 , - 110 , 111 , 111 , 0 ]
722722 let count = chars. count
723723 var res : Bool = false
@@ -841,7 +841,7 @@ class TestNSString : XCTestCase {
841841 let ISOLatin1Encoding = CFStringEncoding ( kCFStringEncodingISOLatin1)
842842
843843 do {
844- let string = unsafeBitCast ( NSString ( string: " this is an external string that should be representable by data " ) , CFString . self)
844+ let string = unsafeBitCast ( NSString ( string: " this is an external string that should be representable by data " ) , to : CFString . self)
845845 let UTF8Data = CFStringCreateExternalRepresentation ( kCFAllocatorDefault, string, UTF8Encoding, 0 )
846846 let UTF8Length = CFDataGetLength ( UTF8Data)
847847 XCTAssertEqual ( UTF8Length, 63 , " NSString should successfully produce an external UTF8 representation with a length of 63 but got \( UTF8Length) bytes " )
@@ -856,7 +856,7 @@ class TestNSString : XCTestCase {
856856 }
857857
858858 do {
859- let string = unsafeBitCast ( NSString ( string: " 🐢 encoding all the way down. 🐢🐢🐢 " ) , CFString . self)
859+ let string = unsafeBitCast ( NSString ( string: " 🐢 encoding all the way down. 🐢🐢🐢 " ) , to : CFString . self)
860860 let UTF8Data = CFStringCreateExternalRepresentation ( kCFAllocatorDefault, string, UTF8Encoding, 0 )
861861 let UTF8Length = CFDataGetLength ( UTF8Data)
862862 XCTAssertEqual ( UTF8Length, 44 , " NSString should successfully produce an external UTF8 representation with a length of 44 but got \( UTF8Length) bytes " )
@@ -996,7 +996,7 @@ let comparisonTests = [
996996 ComparisonTest ( " \u{0341} " , " \u{0954} " ) ,
997997]
998998
999- enum Stack : ErrorType {
999+ enum Stack : ErrorProtocol {
10001000 case Stack( [ UInt ] )
10011001}
10021002
@@ -1024,11 +1024,11 @@ func checkHasPrefixHasSuffix(lhs: String, _ rhs: String, _ stack: [UInt]) -> Int
10241024 rhs. decomposedStringWithCanonicalMapping. characters. map {
10251025 Array ( String ( $0) . unicodeScalars)
10261026 }
1027- let expectHasPrefix = lhsNFDGraphemeClusters. startsWith (
1028- rhsNFDGraphemeClusters, isEquivalent: ( == ) )
1027+ let expectHasPrefix = lhsNFDGraphemeClusters. starts (
1028+ with : rhsNFDGraphemeClusters, isEquivalent: ( == ) )
10291029 let expectHasSuffix =
1030- lhsNFDGraphemeClusters. lazy. reverse ( ) . startsWith (
1031- rhsNFDGraphemeClusters. lazy. reverse ( ) , isEquivalent: ( == ) )
1030+ lhsNFDGraphemeClusters. lazy. reversed ( ) . starts (
1031+ with : rhsNFDGraphemeClusters. lazy. reversed ( ) , isEquivalent: ( == ) )
10321032
10331033 func testFailure( lhs: Bool , _ rhs: Bool , _ stack: [ UInt ] ) -> Int {
10341034 guard lhs == rhs else {
@@ -1077,7 +1077,7 @@ func test_reflection() {
10771077 let ql = PlaygroundQuickLook ( reflecting: testString)
10781078
10791079 switch ql {
1080- case . Text ( let str) : XCTAssertEqual ( testString. bridge ( ) , str)
1080+ case . text ( let str) : XCTAssertEqual ( testString. bridge ( ) , str)
10811081 default : XCTAssertTrue ( false , " mismatched quicklook " )
10821082 }
10831083}
0 commit comments