From 0a7e1f4185ece53efd82e2066979befbcb1dfcd0 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Thu, 7 Jun 2018 07:58:11 -0400 Subject: [PATCH] don't bind error when we're not pattern matching --- Source/SocketIO/Ack/SocketAckEmitter.swift | 4 ++-- Source/SocketIO/Client/SocketIOClient.swift | 8 ++++---- Source/SocketIO/Client/SocketRawView.swift | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/SocketIO/Ack/SocketAckEmitter.swift b/Source/SocketIO/Ack/SocketAckEmitter.swift index 417fe94..de45a39 100644 --- a/Source/SocketIO/Ack/SocketAckEmitter.swift +++ b/Source/SocketIO/Ack/SocketAckEmitter.swift @@ -75,8 +75,8 @@ public final class SocketAckEmitter : NSObject { do { socket.emitAck(ackNum, with: try items.map({ try $0.socketRepresentation() })) - } catch let err { - socket.handleClientEvent(.error, data: [ackNum, items, err]) + } catch { + socket.handleClientEvent(.error, data: [ackNum, items, error]) } } diff --git a/Source/SocketIO/Client/SocketIOClient.swift b/Source/SocketIO/Client/SocketIOClient.swift index 04f35a5..501fe30 100644 --- a/Source/SocketIO/Client/SocketIOClient.swift +++ b/Source/SocketIO/Client/SocketIOClient.swift @@ -214,11 +214,11 @@ open class SocketIOClient : NSObject, SocketIOClientSpec { open func emit(_ event: String, _ items: SocketData...) { do { try emit(event, with: items.map({ try $0.socketRepresentation() })) - } catch let err { + } catch { DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)", type: logType) - handleClientEvent(.error, data: [event, items, err]) + handleClientEvent(.error, data: [event, items, error]) } } @@ -253,11 +253,11 @@ open class SocketIOClient : NSObject, SocketIOClientSpec { open func emitWithAck(_ event: String, _ items: SocketData...) -> OnAckCallback { do { return emitWithAck(event, with: try items.map({ try $0.socketRepresentation() })) - } catch let err { + } catch { DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)", type: logType) - handleClientEvent(.error, data: [event, items, err]) + handleClientEvent(.error, data: [event, items, error]) return OnAckCallback(ackNumber: -1, items: [], socket: self) } diff --git a/Source/SocketIO/Client/SocketRawView.swift b/Source/SocketIO/Client/SocketRawView.swift index 73fe080..e348ade 100644 --- a/Source/SocketIO/Client/SocketRawView.swift +++ b/Source/SocketIO/Client/SocketRawView.swift @@ -48,11 +48,11 @@ public final class SocketRawView : NSObject { public func emit(_ event: String, _ items: SocketData...) { do { try emit(event, with: items.map({ try $0.socketRepresentation() })) - } catch let err { + } catch { DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)", type: "SocketIOClient") - socket.handleClientEvent(.error, data: [event, items, err]) + socket.handleClientEvent(.error, data: [event, items, error]) } } @@ -87,11 +87,11 @@ public final class SocketRawView : NSObject { public func emitWithAck(_ event: String, _ items: SocketData...) -> OnAckCallback { do { return emitWithAck(event, with: try items.map({ try $0.socketRepresentation() })) - } catch let err { + } catch { DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)", type: "SocketIOClient") - socket.handleClientEvent(.error, data: [event, items, err]) + socket.handleClientEvent(.error, data: [event, items, error]) return OnAckCallback(ackNumber: -1, items: [], socket: socket) } @@ -146,8 +146,8 @@ public final class SocketRawAckView : NSObject { do { socket.emit(try items.map({ try $0.socketRepresentation() }), ack: ackNum, binary: false, isAck: true) - } catch let err { - socket.handleClientEvent(.error, data: [ackNum, items, err]) + } catch { + socket.handleClientEvent(.error, data: [ackNum, items, error]) } }