Merge pull request swiftlang#1358 from ikesyo/optional-binding

swift-ci · web-flow · commit fed31bcf64b1 · 2017-12-12T03:37:35.000-08:00
diff --git a/Foundation/Data.swift b/Foundation/Data.swift
@@ -343,8 +343,8 @@ public final class _DataStorage {
             let tryCalloc = (origLength == 0 || (newLength / origLength) >= 4)
             if allocateCleared && tryCalloc {
                 newBytes = _DataStorage.allocate(newCapacity, true)
-                if newBytes != nil {
-                    _DataStorage.move(newBytes!, _bytes!, origLength)
+                if let newBytes = newBytes {
+                    _DataStorage.move(newBytes, _bytes!, origLength)
                     _freeBytes()
                 }
             }
@@ -353,8 +353,8 @@ public final class _DataStorage {
                 allocateCleared = false
                 if _deallocator != nil {
                     newBytes = _DataStorage.allocate(newCapacity, true)
-                    if newBytes != nil {
-                        _DataStorage.move(newBytes!, _bytes!, origLength)
+                    if let newBytes = newBytes {
+                        _DataStorage.move(newBytes, _bytes!, origLength)
                         _freeBytes()
                         _deallocator = nil
                     }
@@ -369,8 +369,8 @@ public final class _DataStorage {
                 allocateCleared = clear && _DataStorage.shouldAllocateCleared(newCapacity)
                 if allocateCleared && tryCalloc {
                     newBytes = _DataStorage.allocate(newCapacity, true)
-                    if newBytes != nil {
-                        _DataStorage.move(newBytes!, _bytes!, origLength)
+                    if let newBytes = newBytes {
+                        _DataStorage.move(newBytes, _bytes!, origLength)
                         _freeBytes()
                     }
                 }
@@ -619,8 +619,8 @@ public final class _DataStorage {
                 memmove(mutableBytes! + start + replacementLength, mutableBytes! + start + length, currentLength - start - length)
             }
             if replacementLength != 0 {
-                if replacementBytes != nil {
-                    memmove(mutableBytes! + start, replacementBytes!, replacementLength)
+                if let replacementBytes = replacementBytes {
+                    memmove(mutableBytes! + start, replacementBytes, replacementLength)
                 } else {
                     memset(mutableBytes! + start, 0, replacementLength)
                 }
diff --git a/Foundation/FileManager.swift b/Foundation/FileManager.swift
@@ -296,15 +296,13 @@ open class FileManager : NSObject {
         result[.systemNumber] = NSNumber(value: UInt64(s.st_dev))
         result[.systemFileNumber] = NSNumber(value: UInt64(s.st_ino))
         
-        let pwd = getpwuid(s.st_uid)
-        if pwd != nil && pwd!.pointee.pw_name != nil {
-            let name = String(cString: pwd!.pointee.pw_name)
+        if let pwd = getpwuid(s.st_uid), pwd.pointee.pw_name != nil {
+            let name = String(cString: pwd.pointee.pw_name)
             result[.ownerAccountName] = name
         }
         
-        let grd = getgrgid(s.st_gid)
-        if grd != nil && grd!.pointee.gr_name != nil {
-            let name = String(cString: grd!.pointee.gr_name)
+        if let grd = getgrgid(s.st_gid), grd.pointee.gr_name != nil {
+            let name = String(cString: grd.pointee.gr_name)
             result[.groupOwnerAccountName] = name
         }
 
diff --git a/Foundation/NSCache.swift b/Foundation/NSCache.swift
@@ -119,8 +119,8 @@ open class NSCache<KeyType : AnyObject, ObjectType : AnyObject> : NSObject {
             return
         }
         
-        while currentElement.nextByCost != nil && currentElement.nextByCost!.cost < entry.cost {
-            currentElement = currentElement.nextByCost!
+        while let nextByCost = currentElement.nextByCost, nextByCost.cost < entry.cost {
+            currentElement = nextByCost
         }
         
         // Insert entry between currentElement and nextElement
diff --git a/Foundation/NSPathUtilities.swift b/Foundation/NSPathUtilities.swift
@@ -475,8 +475,8 @@ public extension NSString {
                     break loop
                 }
                 
-                if char != nil {
-                    let lhs = caseSensitive ? char : String(char!).lowercased().first!
+                if let char = char {
+                    let lhs = caseSensitive ? char : String(char).lowercased().first!
                     let rhs = caseSensitive ? c : String(c).lowercased().first!
                     if lhs != rhs {
                         break loop
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
@@ -699,7 +699,7 @@ extension NSString {
             return
         }
         /* Find the starting point first */
-        if startPtr != nil {
+        if let startPtr = startPtr {
             var start: Int = 0
             if range.location == 0 {
                 start = 0
@@ -723,7 +723,7 @@ extension NSString {
                         buf.rewind()
                     }
                 }
-                startPtr!.pointee = start
+                startPtr.pointee = start
             }
         }
 
diff --git a/Foundation/NSStringAPI.swift b/Foundation/NSStringAPI.swift
@@ -1471,8 +1471,8 @@ extension StringProtocol where Index == String.Index {
         tokenRanges: $0) as NSArray
     }
 
-    if nsTokenRanges != nil {
-      tokenRanges?.pointee = (nsTokenRanges! as [AnyObject]).map {
+    if let nsTokenRanges = nsTokenRanges {
+      tokenRanges?.pointee = (nsTokenRanges as [AnyObject]).map {
         self._range($0.rangeValue)
       }
     }
diff --git a/Foundation/Process.swift b/Foundation/Process.swift
@@ -308,9 +308,9 @@ open class Process: NSObject {
             
             // If a termination handler has been set, invoke it on a background thread
             
-            if process.terminationHandler != nil {
+            if let terminationHandler = process.terminationHandler {
                 let thread = Thread {
-                    process.terminationHandler!(process)
+                    terminationHandler(process)
                 }
                 thread.start()
             }
diff --git a/Foundation/String.swift b/Foundation/String.swift
@@ -29,9 +29,8 @@ extension String : _ObjectTypeBridgeable {
             result = source._storage
         } else if type(of: source) == _NSCFString.self {
             let cf = unsafeBitCast(source, to: CFString.self)
-            let str = CFStringGetCStringPtr(cf, CFStringEncoding(kCFStringEncodingUTF8))
-            if str != nil {
-                result = String(cString: str!)
+            if let str = CFStringGetCStringPtr(cf, CFStringEncoding(kCFStringEncodingUTF8)) {
+                result = String(cString: str)
             } else {
                 let length = CFStringGetLength(cf)
                 let buffer = UnsafeMutablePointer<UniChar>.allocate(capacity: length)
diff --git a/Foundation/XMLParser.swift b/Foundation/XMLParser.swift
@@ -291,10 +291,10 @@ internal func _NSXMLParserStartElementNs(_ ctx: _CFXMLInterface, localname: Unsa
         // idx+3 = value, i+4 = endvalue
         // By using XML_PARSE_NOENT the attribute value string will already have entities resolved
         var attributeValue = ""
-        if attributes[idx + 3] != nil && attributes[idx + 4] != nil {
-            let numBytesWithoutTerminator = attributes[idx + 4]! - attributes[idx + 3]!
+        if let value = attributes[idx + 3], let endvalue = attributes[idx + 4] {
+            let numBytesWithoutTerminator = endvalue - value
             if numBytesWithoutTerminator > 0 {
-                let buffer = UnsafeBufferPointer(start: attributes[idx + 3]!,
+                let buffer = UnsafeBufferPointer(start: value,
                                                  count: numBytesWithoutTerminator)
                 attributeValue = String._fromCodeUnitSequence(UTF8.self,
                                                               input: buffer)!
diff --git a/TestFoundation/TestJSONSerialization.swift b/TestFoundation/TestJSONSerialization.swift
@@ -757,15 +757,14 @@ extension TestJSONSerialization {
                 XCTFail("Unable to convert string to data")
                 return
             }
-            let filePath = createTestFile("TestJSON.txt",_contents: data)
-            if filePath != nil {
-                let fileStream: InputStream = InputStream(fileAtPath: filePath!)!
+            if let filePath = createTestFile("TestJSON.txt",_contents: data) {
+                let fileStream: InputStream = InputStream(fileAtPath: filePath)!
                 fileStream.open()
                 let resultRead = try JSONSerialization.jsonObject(with: fileStream, options: [])
                 let result = resultRead as? [String: Any]
                 XCTAssertEqual(result?.count, 0)
                 fileStream.close()
-                removeTestFile(filePath!)
+                removeTestFile(filePath)
             }
         } catch {
             XCTFail("Error thrown: \(error)")
@@ -780,14 +779,13 @@ extension TestJSONSerialization {
                     XCTFail("Unable to convert string to data")
                     return
                 }
-                let filePath = createTestFile("TestJSON.txt",_contents: data)
-                if filePath != nil {
-                    let url = URL(fileURLWithPath: filePath!)
+                if let filePath = createTestFile("TestJSON.txt",_contents: data) {
+                    let url = URL(fileURLWithPath: filePath)
                     let inputStream: InputStream = InputStream(url: url)!
                     inputStream.open()
                     let result = try JSONSerialization.jsonObject(with: inputStream, options: []) as? [Any]
                     inputStream.close()
-                    removeTestFile(filePath!)
+                    removeTestFile(filePath)
                     XCTAssertEqual(result?[0] as? Bool, true)
                     XCTAssertEqual(result?[1] as? Bool, false)
                     XCTAssertEqual(result?[2] as? String, "hello")
@@ -1387,14 +1385,13 @@ extension TestJSONSerialization {
     func test_jsonObjectToOutputStreamFile() {
         let dict = ["a":["b":1]]
         do {
-            let filePath = createTestFile("TestFileOut.txt",_contents: Data(capacity: 128))
-            if filePath != nil {
-                let outputStream = OutputStream(toFileAtPath: filePath!, append: true)
+            if let filePath = createTestFile("TestFileOut.txt",_contents: Data(capacity: 128)) {
+                let outputStream = OutputStream(toFileAtPath: filePath, append: true)
                 outputStream?.open()
                 let result = try JSONSerialization.writeJSONObject(dict, toStream: outputStream!, options: [])
                 outputStream?.close()
                 if(result > -1) {
-                    let fileStream: InputStream = InputStream(fileAtPath: filePath!)!
+                    let fileStream: InputStream = InputStream(fileAtPath: filePath)!
                     var buffer = [UInt8](repeating: 0, count: 20)
                     fileStream.open()
                     if fileStream.hasBytesAvailable {
@@ -1404,7 +1401,7 @@ extension TestJSONSerialization {
                             XCTAssertEqual(NSString(bytes: buffer, length: buffer.count, encoding: String.Encoding.utf8.rawValue), "{\"a\":{\"b\":1}}")
                         }
                     }
-                    removeTestFile(filePath!)
+                    removeTestFile(filePath)
                 } else {
                     XCTFail("Unable to create temp file")
                 }
diff --git a/TestFoundation/TestStream.swift b/TestFoundation/TestStream.swift
@@ -54,56 +54,56 @@ class TestStream : XCTestCase {
     func test_InputStreamWithUrl() {
         let message: NSString = "Hello, playground"
         let messageData: Data  = message.data(using: String.Encoding.utf8.rawValue)!
+        guard let testFile = createTestFile("testFile_in.txt", _contents: messageData) else {
+            XCTFail("Unable to create temp file")
+            return
+        }
+
         //Initialiser with url
-        let testFile = createTestFile("testFile_in.txt", _contents: messageData)
-        if testFile != nil {
-            let url = URL(fileURLWithPath: testFile!)
-            let urlStream: InputStream = InputStream(url: url)!
-            XCTAssertEqual(Stream.Status.notOpen, urlStream.streamStatus)
-            urlStream.open()
-            XCTAssertEqual(Stream.Status.open, urlStream.streamStatus)
-            var buffer = [UInt8](repeating: 0, count: 20)
-            if urlStream.hasBytesAvailable {
-                let result :Int = urlStream.read(&buffer, maxLength: buffer.count)
-                urlStream.close()
-                XCTAssertEqual(Stream.Status.closed, urlStream.streamStatus)
-                XCTAssertEqual(messageData.count, result)
-                if(result > 0) {
-                    let output = NSString(bytes: &buffer, length: buffer.count, encoding: String.Encoding.utf8.rawValue)
-                    XCTAssertEqual(message, output!)
-                }
+        let url = URL(fileURLWithPath: testFile)
+        let urlStream: InputStream = InputStream(url: url)!
+        XCTAssertEqual(Stream.Status.notOpen, urlStream.streamStatus)
+        urlStream.open()
+        XCTAssertEqual(Stream.Status.open, urlStream.streamStatus)
+        var buffer = [UInt8](repeating: 0, count: 20)
+        if urlStream.hasBytesAvailable {
+            let result :Int = urlStream.read(&buffer, maxLength: buffer.count)
+            urlStream.close()
+            XCTAssertEqual(Stream.Status.closed, urlStream.streamStatus)
+            XCTAssertEqual(messageData.count, result)
+            if(result > 0) {
+                let output = NSString(bytes: &buffer, length: buffer.count, encoding: String.Encoding.utf8.rawValue)
+                XCTAssertEqual(message, output!)
             }
-            removeTestFile(testFile!)
-        } else {
-            XCTFail("Unable to create temp file")
         }
+        removeTestFile(testFile)
     }
     
     func test_InputStreamWithFile() {
         let message: NSString = "Hello, playground"
         let messageData: Data  = message.data(using: String.Encoding.utf8.rawValue)!
+        guard let testFile = createTestFile("testFile_in.txt", _contents: messageData) else {
+            XCTFail("Unable to create temp file")
+            return
+        }
+
         //Initialiser with file
-        let testFile = createTestFile("testFile_in.txt", _contents: messageData)
-        if testFile != nil {
-            let fileStream: InputStream = InputStream(fileAtPath: testFile!)!
-            XCTAssertEqual(Stream.Status.notOpen, fileStream.streamStatus)
-            fileStream.open()
-            XCTAssertEqual(Stream.Status.open, fileStream.streamStatus)
-            var buffer = [UInt8](repeating: 0, count: 20)
-            if fileStream.hasBytesAvailable {
-                let result: Int = fileStream.read(&buffer, maxLength: buffer.count)
-                fileStream.close()
-                XCTAssertEqual(Stream.Status.closed, fileStream.streamStatus)
-                XCTAssertEqual(messageData.count, result)
-                if(result > 0){
-                    let output = NSString(bytes: &buffer, length: buffer.count, encoding: String.Encoding.utf8.rawValue)
-                    XCTAssertEqual(message, output!)
-                }
+        let fileStream: InputStream = InputStream(fileAtPath: testFile)!
+        XCTAssertEqual(Stream.Status.notOpen, fileStream.streamStatus)
+        fileStream.open()
+        XCTAssertEqual(Stream.Status.open, fileStream.streamStatus)
+        var buffer = [UInt8](repeating: 0, count: 20)
+        if fileStream.hasBytesAvailable {
+            let result: Int = fileStream.read(&buffer, maxLength: buffer.count)
+            fileStream.close()
+            XCTAssertEqual(Stream.Status.closed, fileStream.streamStatus)
+            XCTAssertEqual(messageData.count, result)
+            if(result > 0){
+                let output = NSString(bytes: &buffer, length: buffer.count, encoding: String.Encoding.utf8.rawValue)
+                XCTAssertEqual(message, output!)
             }
-            removeTestFile(testFile!)
-        } else {
-            XCTFail("Unable to create temp file")
         }
+        removeTestFile(testFile)
     }
     
     func test_InputStreamHasBytesAvailable() {
@@ -125,22 +125,22 @@ class TestStream : XCTestCase {
     }
     
     func test_outputStreamCreationToFile() {
-        let filePath = createTestFile("TestFileOut.txt", _contents: Data(capacity: 256))
-        if filePath != nil {
-            let outputStream = OutputStream(toFileAtPath: filePath!, append: true)
-            XCTAssertEqual(Stream.Status.notOpen, outputStream!.streamStatus)
-            var myString = "Hello world!"
-            let encodedData = [UInt8](myString.utf8)
-            outputStream?.open()
-            XCTAssertEqual(Stream.Status.open, outputStream!.streamStatus)
-            let result: Int? = outputStream?.write(encodedData, maxLength: encodedData.count)
-            outputStream?.close()
-            XCTAssertEqual(myString.count, result)
-            XCTAssertEqual(Stream.Status.closed, outputStream!.streamStatus)
-            removeTestFile(filePath!)
-        } else {
+        guard let filePath = createTestFile("TestFileOut.txt", _contents: Data(capacity: 256)) else {
             XCTFail("Unable to create temp file");
+            return
         }
+
+        let outputStream = OutputStream(toFileAtPath: filePath, append: true)
+        XCTAssertEqual(Stream.Status.notOpen, outputStream!.streamStatus)
+        var myString = "Hello world!"
+        let encodedData = [UInt8](myString.utf8)
+        outputStream?.open()
+        XCTAssertEqual(Stream.Status.open, outputStream!.streamStatus)
+        let result: Int? = outputStream?.write(encodedData, maxLength: encodedData.count)
+        outputStream?.close()
+        XCTAssertEqual(myString.count, result)
+        XCTAssertEqual(Stream.Status.closed, outputStream!.streamStatus)
+        removeTestFile(filePath)
     }
     
     func  test_outputStreamCreationToBuffer() {
@@ -159,22 +159,22 @@ class TestStream : XCTestCase {
     }
     
     func test_outputStreamCreationWithUrl() {
-        let filePath = createTestFile("TestFileOut.txt", _contents: Data(capacity: 256))
-        if filePath != nil {
-            let outputStream = OutputStream(url: URL(fileURLWithPath: filePath!), append: true)
-            XCTAssertEqual(Stream.Status.notOpen, outputStream!.streamStatus)
-            var myString = "Hello world!"
-            let encodedData = [UInt8](myString.utf8)
-            outputStream!.open()
-            XCTAssertEqual(Stream.Status.open, outputStream!.streamStatus)
-            let result: Int? = outputStream?.write(encodedData, maxLength: encodedData.count)
-            outputStream?.close()
-            XCTAssertEqual(myString.count, result)
-            XCTAssertEqual(Stream.Status.closed, outputStream!.streamStatus)
-            removeTestFile(filePath!)
-        } else {
+        guard let filePath = createTestFile("TestFileOut.txt", _contents: Data(capacity: 256)) else {
             XCTFail("Unable to create temp file");
+            return
         }
+
+        let outputStream = OutputStream(url: URL(fileURLWithPath: filePath), append: true)
+        XCTAssertEqual(Stream.Status.notOpen, outputStream!.streamStatus)
+        var myString = "Hello world!"
+        let encodedData = [UInt8](myString.utf8)
+        outputStream!.open()
+        XCTAssertEqual(Stream.Status.open, outputStream!.streamStatus)
+        let result: Int? = outputStream?.write(encodedData, maxLength: encodedData.count)
+        outputStream?.close()
+        XCTAssertEqual(myString.count, result)
+        XCTAssertEqual(Stream.Status.closed, outputStream!.streamStatus)
+        removeTestFile(filePath)
     }
     
     func test_outputStreamCreationToMemory(){
diff --git a/TestFoundation/XDGTestHelper.swift b/TestFoundation/XDGTestHelper.swift

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ open class NSCache<KeyType : AnyObject, ObjectType : AnyObject> : NSObject {`
`119`	`119`	`return`
`120`	`120`	`}`
`121`	`121`
`122`		`- while currentElement.nextByCost != nil && currentElement.nextByCost!.cost < entry.cost {`
`123`		`- currentElement = currentElement.nextByCost!`
	`122`	`+ while let nextByCost = currentElement.nextByCost, nextByCost.cost < entry.cost {`
	`123`	`+ currentElement = nextByCost`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`// Insert entry between currentElement and nextElement`
Original file line number	Diff line number	Diff line change
`@@ -699,7 +699,7 @@ extension NSString {`
`699`	`699`	`return`
`700`	`700`	`}`
`701`	`701`	`/* Find the starting point first */`
`702`		`- if startPtr != nil {`
	`702`	`+ if let startPtr = startPtr {`
`703`	`703`	`var start: Int = 0`
`704`	`704`	`if range.location == 0 {`
`705`	`705`	`start = 0`
`@@ -723,7 +723,7 @@ extension NSString {`
`723`	`723`	`buf.rewind()`
`724`	`724`	`}`
`725`	`725`	`}`
`726`		`- startPtr!.pointee = start`
	`726`	`+ startPtr.pointee = start`
`727`	`727`	`}`
`728`	`728`	`}`
`729`	`729`
Original file line number	Diff line number	Diff line change
`@@ -1471,8 +1471,8 @@ extension StringProtocol where Index == String.Index {`
`1471`	`1471`	`tokenRanges: $0) as NSArray`
`1472`	`1472`	`}`
`1473`	`1473`
`1474`		`- if nsTokenRanges != nil {`
`1475`		`- tokenRanges?.pointee = (nsTokenRanges! as [AnyObject]).map {`
	`1474`	`+ if let nsTokenRanges = nsTokenRanges {`
	`1475`	`+ tokenRanges?.pointee = (nsTokenRanges as [AnyObject]).map {`
`1476`	`1476`	`self._range($0.rangeValue)`
`1477`	`1477`	`}`
`1478`	`1478`	`}`
Original file line number	Diff line number	Diff line change
`@@ -308,9 +308,9 @@ open class Process: NSObject {`
`308`	`308`
`309`	`309`	`// If a termination handler has been set, invoke it on a background thread`
`310`	`310`
`311`		`- if process.terminationHandler != nil {`
	`311`	`+ if let terminationHandler = process.terminationHandler {`
`312`	`312`	`let thread = Thread {`
`313`		`- process.terminationHandler!(process)`
	`313`	`+ terminationHandler(process)`
`314`	`314`	`}`
`315`	`315`	`thread.start()`
`316`	`316`	`}`