From 083028787466a53d302f33b721d8d750a544506f Mon Sep 17 00:00:00 2001 From: David Jones Date: Tue, 1 Oct 2019 09:46:08 +0100 Subject: [PATCH] Resolve compile warnings in future versions of Swift --- Sources/Socket/Socket.swift | 2 +- Sources/Socket/SocketProtocols.swift | 4 ++-- Tests/SocketTests/SocketTests.swift | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Sources/Socket/Socket.swift b/Sources/Socket/Socket.swift index 387886f..b46f715 100644 --- a/Sources/Socket/Socket.swift +++ b/Sources/Socket/Socket.swift @@ -1238,7 +1238,7 @@ public class Socket: SocketReader, SocketWriter { var info: UnsafeMutablePointer? // Retrieve the info on our target... - var status: Int32 = getaddrinfo(host, String(port), nil, &info) + let status: Int32 = getaddrinfo(host, String(port), nil, &info) if status != 0 { return nil diff --git a/Sources/Socket/SocketProtocols.swift b/Sources/Socket/SocketProtocols.swift index c082f06..e718529 100644 --- a/Sources/Socket/SocketProtocols.swift +++ b/Sources/Socket/SocketProtocols.swift @@ -186,7 +186,7 @@ public enum SSLError: Swift.Error, CustomStringConvertible { case .retryNeeded: return -1 - case .fail(let (errCode, _)): + case .fail(let errCode, _): return Int(errCode) } } @@ -202,7 +202,7 @@ public enum SSLError: Swift.Error, CustomStringConvertible { case .retryNeeded: return "Retry operation" - case .fail(let (_, reason)): + case .fail(_, let reason): return reason } } diff --git a/Tests/SocketTests/SocketTests.swift b/Tests/SocketTests/SocketTests.swift index 7071147..1fb2f5a 100644 --- a/Tests/SocketTests/SocketTests.swift +++ b/Tests/SocketTests/SocketTests.swift @@ -1164,7 +1164,6 @@ class SocketTests: XCTestCase { let hostname = "127.0.0.1" let port: Int32 = 1337 - let bufSize = 4096 var data = Data() do { @@ -1246,7 +1245,6 @@ class SocketTests: XCTestCase { let hostname = "127.0.0.1" let port: Int32 = 1337 - let bufSize = 4096 var data = Data() do { @@ -1350,9 +1348,6 @@ class SocketTests: XCTestCase { let hostname = "127.0.0.1" let port: Int32 = 1337 - let bufSize = 4096 - var data = Data() - do { self.launchUDPHelper() @@ -1444,7 +1439,6 @@ class SocketTests: XCTestCase { func testReadWriteUnix() { - let bufSize = 4096 var data = Data() do {