Updated for Swift 3.0

2016-07-23

Author: colemancda

Sources/SwiftFoundation/Data.swift

@@ -100,7 +100,7 @@
 
         public var description: String {
 
-            let hexString = bytes.map({ $0.toHexadecimal() }).reduce("", combine: { $0.0 + $0.1 })
+            let hexString = bytes.map({ $0.toHexadecimal() }).reduce("", { $0.0 + $0.1 })
 
             return "<" + hexString + ">"
         }

Sources/SwiftFoundation/FileManager.swift

@@ -75,9 +75,9 @@ public struct FileManager {
 
         let stringBufferSize = Int(PATH_MAX)
 
-        let path = UnsafeMutablePointer<CChar>(allocatingCapacity: stringBufferSize)
+        let path = UnsafeMutablePointer<CChar>.allocate(capacity: stringBufferSize)
 
-        defer { path.deallocateCapacity(stringBufferSize) }
+        defer { path.deallocate(capacity: stringBufferSize) }
 
         getcwd(path, stringBufferSize - 1)
 
@@ -193,9 +193,9 @@ public struct FileManager {
 
         #endif
 
-        let memoryPointer = UnsafeMutablePointer<Byte>(allocatingCapacity: fileSize)
+        let memoryPointer = UnsafeMutablePointer<Byte>.allocate(capacity: fileSize)
 
-        defer { memoryPointer.deallocateCapacity(fileSize) }
+        defer { memoryPointer.deallocate(capacity: fileSize) }
 
         let readBytes = read(file, memoryPointer, fileSize)
 

Sources/SwiftFoundation/Hash.swift

@@ -10,5 +10,5 @@
 public func Hash(_ data: Data) -> Int {
 
     // more expensive than casting but that's not safe for large values.
-    return data.bytes.map({ Int($0) }).reduce(0, combine: { $0.0 ^ $0.1 })
+    return data.bytes.map({ Int($0) }).reduce(0, { $0.0 ^ $0.1 })
 }

Sources/SwiftFoundation/JSONParse.swift

@@ -16,9 +16,9 @@ public extension JSON.Value {
 
     public init?(string: Swift.String) {
 
-        let tokenerError: UnsafeMutablePointer<json_tokener_error>! = UnsafeMutablePointer<json_tokener_error>(allocatingCapacity: 1)
+        let tokenerError: UnsafeMutablePointer<json_tokener_error>! = UnsafeMutablePointer<json_tokener_error>.allocate(capacity: 1)
 
-        defer { tokenerError.deallocateCapacity(1) }
+        defer { tokenerError.deallocate(capacity: 1) }
 
         let jsonObject = json_tokener_parse_verbose(string, tokenerError)
 

Sources/SwiftFoundation/Lock.swift

@@ -22,7 +22,7 @@
 
     public final class Lock: Locking {
 
-        private var mutex = UnsafeMutablePointer<pthread_mutex_t>(allocatingCapacity: 1)
+        private var mutex = UnsafeMutablePointer<pthread_mutex_t>.allocate(capacity: 1)
 
         public init() {
             pthread_mutex_init(mutex, nil)
@@ -31,7 +31,7 @@
         deinit {
             pthread_mutex_destroy(mutex)
             mutex.deinitialize()
-            mutex.deallocateCapacity(1)
+            mutex.deallocate(capacity: 1)
         }
 
         public func lock() {
@@ -131,7 +131,7 @@
     }
 
     public final class RecursiveLock: Locking {
-        private var mutex = UnsafeMutablePointer<pthread_mutex_t>(allocatingCapacity: 1)
+        private var mutex = UnsafeMutablePointer<pthread_mutex_t>.allocate(capacity: 1)
 
         public init() {
 
@@ -145,7 +145,7 @@
         deinit {
             pthread_mutex_destroy(mutex)
             mutex.deinitialize()
-            mutex.deallocateCapacity(1)
+            mutex.deallocate(capacity: 1)
         }
 
         public func lock() {
@@ -164,8 +164,8 @@
     }
 
     public final class Condition: Locking {
-        private var mutex = UnsafeMutablePointer<pthread_mutex_t>(allocatingCapacity: 1)
-        private var cond = UnsafeMutablePointer<pthread_cond_t>(allocatingCapacity: 1)
+        private var mutex = UnsafeMutablePointer<pthread_mutex_t>.allocate(capacity: 1)
+        private var cond = UnsafeMutablePointer<pthread_cond_t>.allocate(capacity: 1)
 
         public init() {
             pthread_mutex_init(mutex, nil)
@@ -177,8 +177,8 @@
             pthread_cond_destroy(cond)
             mutex.deinitialize()
             cond.deinitialize()
-            mutex.deallocateCapacity(1)
-            cond.deallocateCapacity(1)
+            mutex.deallocate(capacity: 1)
+            cond.deallocate(capacity: 1)
         }
 
         public func lock() {

Sources/SwiftFoundation/POSIXRegularExpression.swift

@@ -39,7 +39,7 @@ public extension POSIXRegularExpression {
 
         let numberOfMatches = re_nsub + 1 // first match is the expression itself, later matches are subexpressions
 
-        let matchesPointer = UnsafeMutablePointer<Match>.init(allocatingCapacity: numberOfMatches)
+        let matchesPointer = UnsafeMutablePointer<Match>.allocate(capacity: numberOfMatches)
         defer { matchesPointer.deinitialize(count: numberOfMatches) }
 
         let flags = options.optionsBitmask()

Sources/SwiftFoundation/UUID.swift

@@ -59,9 +59,9 @@
 
         init?(rawValue: String) {
 
-            let uuidPointer = UnsafeMutablePointer<uuid_t>(allocatingCapacity: 1)
+            let uuidPointer = UnsafeMutablePointer<uuid_t>.allocate(capacity: 1)
 
-            defer { uuidPointer.deallocateCapacity(1) }
+            defer { uuidPointer.deallocate(capacity: 1) }
 
             guard uuid_parse(rawValue, unsafeBitCast(uuidPointer, to: UnsafeMutablePointer<UInt8>.self)) != -1
                 else { return nil }

Sources/UnitTests/DataTests.swift

@@ -25,9 +25,9 @@ final class DataTests: XCTestCase {
 
         XCTAssert(testData.isEmpty == false, "Could not create test data")
 
-        let dataPointer = UnsafeMutablePointer<Byte>(allocatingCapacity: testData.count)
+        let dataPointer = UnsafeMutablePointer<Byte>.allocate(capacity: testData.count)
 
-        defer { dataPointer.deallocateCapacity(testData.count) }
+        defer { dataPointer.deallocate(capacity: testData.count) }
 
         memcpy(dataPointer, testData.bytes, testData.count)