From 31adcd4728d2e09285b4dea3d7aadde22866fdea Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Sat, 10 Sep 2016 09:17:50 -0400
Subject: [PATCH] clean up some things before xcode8 release

---
 Source/SocketEngine.swift         |  8 ++++----
 Source/SocketEnginePollable.swift |  4 +++-
 Source/SocketExtensions.swift     |  2 +-
 Source/SocketIOClient.swift       | 19 +++++++++----------
 Source/SocketPacket.swift         |  9 ++++-----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index 994d799..1baed43 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -340,7 +340,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
             ws.writeString(msg)
         }
 
-        postWait.removeAll(keepingCapacity: true)
+        postWait.removeAll(keepingCapacity: false)
     }
 
     private func handleClose(_ reason: String) {
@@ -364,6 +364,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
         
         guard let sid = json["sid"] as? String else {
             didError(reason: "Open packet contained no sid")
+            
             return
         }
         
@@ -435,14 +436,13 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
 
         switch type {
         case .message:
-            handleMessage(
-                fixedString[fixedString.characters.index(after: fixedString.characters.startIndex)..<fixedString.endIndex])
+            handleMessage(String(fixedString.characters.dropFirst()))
         case .noop:
             handleNOOP()
         case .pong:
             handlePong(with: fixedString)
         case .open:
-            handleOpen(openData: fixedString[fixedString.characters.index(after: fixedString.characters.startIndex)..<fixedString.endIndex])
+            handleOpen(openData: String(fixedString.characters.dropFirst()))
         case .close:
             handleClose(fixedString)
         default:
diff --git a/Source/SocketEnginePollable.swift b/Source/SocketEnginePollable.swift
index e0d02be..b050975 100644
--- a/Source/SocketEnginePollable.swift
+++ b/Source/SocketEnginePollable.swift
@@ -90,7 +90,9 @@ extension SocketEnginePollable {
     }
     
     public func doPoll() {
-        if websocket || waitingForPoll || !connected || closed { return }
+        if websocket || waitingForPoll || !connected || closed {
+            return
+        }
         
         waitingForPoll = true
         
diff --git a/Source/SocketExtensions.swift b/Source/SocketExtensions.swift
index c3459bc..bf5280a 100644
--- a/Source/SocketExtensions.swift
+++ b/Source/SocketExtensions.swift
@@ -31,7 +31,7 @@ enum JSONError : Error {
 
 extension Array {
     func toJSON() throws -> Data {
-        return try JSONSerialization.data(withJSONObject: self as NSArray, options: JSONSerialization.WritingOptions(rawValue: 0))
+        return try JSONSerialization.data(withJSONObject: self, options: JSONSerialization.WritingOptions(rawValue: 0))
     }
 }
 
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index 7d27377..0a51bd0 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -257,14 +257,14 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
     // If the server wants to know that the client received data
     func emitAck(_ ack: Int, with items: [Any]) {
         emitQueue.async {
-            if self.status == .connected {
-                let packet = SocketPacket.packetFromEmit(items, id: ack, nsp: self.nsp, ack: true)
-                let str = packet.packetString
-
-                DefaultSocketLogger.Logger.log("Emitting Ack: %@", type: self.logType, args: str)
-
-                self.engine?.send(str, withData: packet.binary)
-            }
+            guard self.status == .connected else { return }
+            
+            let packet = SocketPacket.packetFromEmit(items, id: ack, nsp: self.nsp, ack: true)
+            let str = packet.packetString
+            
+            DefaultSocketLogger.Logger.log("Emitting Ack: %@", type: self.logType, args: str)
+            
+            self.engine?.send(str, withData: packet.binary)
         }
     }
 
@@ -428,8 +428,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
         }
 
         DefaultSocketLogger.Logger.log("Trying to reconnect", type: logType)
-        handleEvent("reconnectAttempt", data: [(reconnectAttempts - currentReconnectAttempt)],
-            isInternalMessage: true)
+        handleEvent("reconnectAttempt", data: [(reconnectAttempts - currentReconnectAttempt)], isInternalMessage: true)
 
         currentReconnectAttempt += 1
         connect()
diff --git a/Source/SocketPacket.swift b/Source/SocketPacket.swift
index 99437a9..68e7a1e 100644
--- a/Source/SocketPacket.swift
+++ b/Source/SocketPacket.swift
@@ -40,7 +40,6 @@ struct SocketPacket {
     
     var binary: [Data]
     var data: [Any]
-    
     var args: [Any] {
         if type == .event || type == .binaryEvent && data.count != 0 {
             return Array(data.dropFirst())
@@ -62,8 +61,8 @@ struct SocketPacket {
         return createPacketString()
     }
     
-    init(type: PacketType, data: [Any] = [Any](), id: Int = -1,
-        nsp: String, placeholders: Int = 0, binary: [Data] = [Data]()) {
+    init(type: PacketType, data: [Any] = [Any](), id: Int = -1, nsp: String, placeholders: Int = 0,
+         binary: [Data] = [Data]()) {
         self.data = data
         self.id = id
         self.nsp = nsp
@@ -112,9 +111,9 @@ struct SocketPacket {
     private func createPacketString() -> String {
         let typeString = String(type.rawValue)
         // Binary count?
-        let binaryCountString = typeString + (type == .binaryEvent || type == .binaryAck ? String(binary.count) + "-" : "")
+        let binaryCountString = typeString + (type == .binaryEvent || type == .binaryAck ? "\(String(binary.count))-" : "")
         // Namespace?
-        let nspString = binaryCountString + (nsp != "/" ? nsp + "," : "")
+        let nspString = binaryCountString + (nsp != "/" ? "\(nsp)," : "")
         // Ack number?
         let idString = nspString + (id != -1 ? String(id) : "")