Updated for 07-25 chain

kjessup · kjessup · commit d73f0d3bc40a · 2016-07-26T14:07:55.000-04:00
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+DEVELOPMENT-SNAPSHOT-2016-07-25-a
diff --git a/Sources/PerfectLib/Dir.swift b/Sources/PerfectLib/Dir.swift
@@ -146,8 +146,8 @@ public struct Dir {
 		defer { closedir(dir) }
 
 		var ent = dirent()
-		let entPtr = UnsafeMutablePointer<UnsafeMutablePointer<dirent>?>(allocatingCapacity:  1)
-		defer { entPtr.deallocateCapacity(1) }
+		let entPtr = UnsafeMutablePointer<UnsafeMutablePointer<dirent>?>.allocate(capacity:  1)
+		defer { entPtr.deallocate(capacity: 1) }
 
 		while readDir(dir, &ent, entPtr) == 0 && entPtr.pointee != nil {
 			let name = ent.d_name
@@ -165,13 +165,13 @@ public struct Dir {
                 guard let (_, elem) = childGen.next() else {
                     break
                 }
-				guard let elemI = elem as? Int8 where elemI != 0 else {
+				guard let elemI = elem as? Int8, elemI != 0 else {
 					break
 				}
 				nameBuf.append(elemI)
 			}
 			nameBuf.append(0)
-			if let name = String(validatingUTF8: nameBuf) where !(name == "." || name == "..") {
+			if let name = String(validatingUTF8: nameBuf), !(name == "." || name == "..") {
                 if Int32(type) == Int32(DT_DIR) {
                     try closure(name: name + "/")
                 } else {
diff --git a/Sources/PerfectLib/File.swift b/Sources/PerfectLib/File.swift
@@ -107,7 +107,7 @@ public class File {
 		if !inPath.isEmpty && inPath[inPath.startIndex] == "~" {
 			var wexp = wordexp_t()
 			wordexp(inPath, &wexp, 0)
-			if let resolved = wexp.we_wordv[0], pth = String(validatingUTF8: resolved) {
+			if let resolved = wexp.we_wordv[0], let pth = String(validatingUTF8: resolved) {
 				return pth
 			}
 		}
@@ -521,7 +521,7 @@ public final class TemporaryFile: File {
     public convenience init(withPrefix: String) {
         let template = withPrefix + "XXXXXX"
         let utf8 = template.utf8
-        let name = UnsafeMutablePointer<Int8>(allocatingCapacity: utf8.count + 1)
+        let name = UnsafeMutablePointer<Int8>.allocate(capacity: utf8.count + 1)
         var i = utf8.startIndex
         for index in 0..<utf8.count {
             name[index] = Int8(utf8[i])
@@ -532,7 +532,7 @@ public final class TemporaryFile: File {
         let fd = mkstemp(name)
         let tmpFileName = String(validatingUTF8: name)!
 
-        name.deallocateCapacity(utf8.count + 1)
+        name.deallocate(capacity: utf8.count + 1)
 
         self.init(tmpFileName, fd: fd)
     }
diff --git a/Sources/PerfectLib/JSONConvertible.swift b/Sources/PerfectLib/JSONConvertible.swift
@@ -96,7 +96,7 @@ public extension JSONConvertibleObject {
 }
 
 /// An error occurring during JSON conversion.
-public enum JSONConversionError: ErrorProtocol {
+public enum JSONConversionError: Error {
     /// The object did not suppport JSON conversion.
     case notConvertible(Any)
     /// A provided key was not a String.
diff --git a/Sources/PerfectLib/Log.swift b/Sources/PerfectLib/Log.swift
@@ -147,8 +147,7 @@ public struct Log {
 		Log.logger.critical(message: message)
 	}
 	
-	@noreturn
-	public static func terminal(message: String) {
+	public static func terminal(message: String) -> Never  {
 		Log.logger.terminal(message: message)
 		fatalError(message)
 	}
diff --git a/Sources/PerfectLib/PerfectError.swift b/Sources/PerfectLib/PerfectError.swift
@@ -28,7 +28,7 @@ import Darwin
 #endif
 
 /// Some but not all of the exception types which may be thrown by the system
-public enum PerfectError : ErrorProtocol {
+public enum PerfectError : Error {
 	/// A network related error code and message.
 	case networkError(Int32, String)
 	/// A file system related error code and message.
@@ -39,8 +39,8 @@ public enum PerfectError : ErrorProtocol {
 	case apiError(String)
 }
 
-@noreturn
-func ThrowFileError(file: String = #file, function: String = #function, line: Int = #line) throws {
+
+func ThrowFileError(file: String = #file, function: String = #function, line: Int = #line) throws -> Never  {
 	let err = errno
 	let msg = String(validatingUTF8: strerror(err))!
 	
@@ -49,8 +49,8 @@ func ThrowFileError(file: String = #file, function: String = #function, line: In
 	throw PerfectError.fileError(err, msg + " \(file) \(function) \(line)")
 }
 
-@noreturn
-func ThrowSystemError(file: String = #file, function: String = #function, line: Int = #line) throws {
+
+func ThrowSystemError(file: String = #file, function: String = #function, line: Int = #line) throws -> Never  {
 	let err = errno
 	let msg = String(validatingUTF8: strerror(err))!
 	
@@ -59,8 +59,8 @@ func ThrowSystemError(file: String = #file, function: String = #function, line:
 	throw PerfectError.systemError(err, msg + " \(file) \(function) \(line)")
 }
 
-@noreturn
-func ThrowNetworkError(file: String = #file, function: String = #function, line: Int = #line) throws {
+
+func ThrowNetworkError(file: String = #file, function: String = #function, line: Int = #line) throws -> Never  {
 	let err = errno
 	let msg = String(validatingUTF8: strerror(err))!
 	
diff --git a/Sources/PerfectLib/SysProcess.swift b/Sources/PerfectLib/SysProcess.swift
@@ -48,11 +48,11 @@ public class SysProcess {
         typealias maybeCChar = UnsafeMutablePointer<CChar>?
         
 		let cArgsCount = args?.count ?? 0
-		let cArgs = UnsafeMutablePointer<maybeCChar>(allocatingCapacity: cArgsCount + 2)
+		let cArgs = UnsafeMutablePointer<maybeCChar>.allocate(capacity: cArgsCount + 2)
 
 		defer {
             cArgs.deinitialize(count: cArgsCount + 2)
-            cArgs.deallocateCapacity(cArgsCount + 2)
+            cArgs.deallocate(capacity: cArgsCount + 2)
         }
 
 		cArgs[0] = strdup(cmd)
@@ -63,9 +63,9 @@ public class SysProcess {
 		}
 
 		let cEnvCount = env?.count ?? 0
-		let cEnv = UnsafeMutablePointer<maybeCChar>(allocatingCapacity: cEnvCount + 1)
+		let cEnv = UnsafeMutablePointer<maybeCChar>.allocate(capacity: cEnvCount + 1)
 
-		defer { cEnv.deinitialize(count: cEnvCount + 1) ; cEnv.deallocateCapacity(cEnvCount + 1) }
+		defer { cEnv.deinitialize(count: cEnvCount + 1) ; cEnv.deallocate(capacity: cEnvCount + 1) }
 
 		cEnv[cEnvCount] = UnsafeMutablePointer<CChar>(nil)
 		for idx in 0..<cEnvCount {
diff --git a/Sources/PerfectLib/Utilities.swift b/Sources/PerfectLib/Utilities.swift
@@ -283,18 +283,18 @@ public struct UUID {
 	let uuid: uuid_t
 	
 	public init() {
-		let u = UnsafeMutablePointer<UInt8>(allocatingCapacity:  sizeof(uuid_t.self))
+		let u = UnsafeMutablePointer<UInt8>.allocate(capacity:  sizeof(uuid_t.self))
 		defer {
-			u.deallocateCapacity(sizeof(uuid_t.self))
+			u.deallocate(capacity: sizeof(uuid_t.self))
 		}
 		uuid_generate_random(u)
 		self.uuid = UUID.uuidFromPointer(u)
 	}
 	
 	public init(_ string: String) {
-		let u = UnsafeMutablePointer<UInt8>(allocatingCapacity:  sizeof(uuid_t.self))
+		let u = UnsafeMutablePointer<UInt8>.allocate(capacity:  sizeof(uuid_t.self))
 		defer {
-			u.deallocateCapacity(sizeof(uuid_t.self))
+			u.deallocate(capacity: sizeof(uuid_t.self))
 		}
 		uuid_parse(string, u)
 		self.uuid = UUID.uuidFromPointer(u)
@@ -310,11 +310,11 @@ public struct UUID {
 	}
 	
 	public var string: String {
-		let u = UnsafeMutablePointer<UInt8>(allocatingCapacity:  sizeof(uuid_t.self))
-		let unu = UnsafeMutablePointer<Int8>(allocatingCapacity:  37) // as per spec. 36 + null
+		let u = UnsafeMutablePointer<UInt8>.allocate(capacity:  sizeof(uuid_t.self))
+		let unu = UnsafeMutablePointer<Int8>.allocate(capacity:  37) // as per spec. 36 + null
 		defer {
-			u.deallocateCapacity(sizeof(uuid_t.self))
-			unu.deallocateCapacity(37)
+			u.deallocate(capacity: sizeof(uuid_t.self))
+			unu.deallocate(capacity: 37)
 		}
 		var uu = self.uuid
 		memcpy(u, &uu, sizeof(uuid_t.self))
@@ -632,9 +632,9 @@ public func formatDate(_ date: Double, format: String, timezone inTimezone: Stri
 	var time = time_t(date / 1000.0)
 	gmtime_r(&time, &t)
 	let maxResults = 1024
-	let results = UnsafeMutablePointer<Int8>(allocatingCapacity:  maxResults)
+	let results = UnsafeMutablePointer<Int8>.allocate(capacity:  maxResults)
 	defer {
-		results.deallocateCapacity(maxResults)
+		results.deallocate(capacity: maxResults)
 	}
 	let res = strftime(results, maxResults, format, &t)
 	if res > 0 {
@@ -701,8 +701,8 @@ import OpenSSL
 
 extension String.UTF8View {
     var sha1: [UInt8] {
-        let bytes = UnsafeMutablePointer<UInt8>(allocatingCapacity:  Int(SHA_DIGEST_LENGTH))
-        defer { bytes.deallocateCapacity(Int(SHA_DIGEST_LENGTH)) }
+        let bytes = UnsafeMutablePointer<UInt8>.allocate(capacity:  Int(SHA_DIGEST_LENGTH))
+        defer { bytes.deallocate(capacity: Int(SHA_DIGEST_LENGTH)) }
         
         SHA1(Array<UInt8>(self), (self.count), bytes)
         
diff --git a/Tests/PerfectLib/PerfectLibTests.swift b/Tests/PerfectLib/PerfectLibTests.swift
@@ -267,8 +267,8 @@ class PerfectLibTests: XCTestCase {
 			try server.bind(address: sock)
 			server.listen()
 
-			let serverExpectation = self.expectation(withDescription: "server")
-			let clientExpectation = self.expectation(withDescription: "client")
+			let serverExpectation = self.expectation(description: "server")
+			let clientExpectation = self.expectation(description: "client")
 
 			try server.accept(timeoutSeconds: NetEvent.noTimeout) {
 				(inn: NetTCP?) -> () in
@@ -318,13 +318,13 @@ class PerfectLibTests: XCTestCase {
 					clientExpectation.fulfill()
 				}
 			}
-			self.waitForExpectations(withTimeout: 10000, handler: {
+			self.waitForExpectations(timeout: 10000) {
 				_ in
 				server.close()
 				client.close()
 				testFile.close()
 				testFile.delete()
-			})
+			}
 		} catch PerfectError.networkError(let code, let msg) {
 			XCTAssert(false, "Exception: \(code) \(msg)")
 		} catch let e {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3.0`
	`1`	`+DEVELOPMENT-SNAPSHOT-2016-07-25-a`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public extension JSONConvertibleObject {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/// An error occurring during JSON conversion.`
`99`		`-public enum JSONConversionError: ErrorProtocol {`
	`99`	`+public enum JSONConversionError: Error {`
`100`	`100`	`/// The object did not suppport JSON conversion.`
`101`	`101`	`case notConvertible(Any)`
`102`	`102`	`/// A provided key was not a String.`
Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,7 @@ public struct Log {`
`147`	`147`	`Log.logger.critical(message: message)`
`148`	`148`	`}`
`149`	`149`
`150`		`- @noreturn`
`151`		`- public static func terminal(message: String) {`
	`150`	`+ public static func terminal(message: String) -> Never {`
`152`	`151`	`Log.logger.terminal(message: message)`
`153`	`152`	`fatalError(message)`
`154`	`153`	`}`