From fafeebe18506add5e54347af39149816856b19b7 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 8 Jun 2015 21:03:49 -0400 Subject: [PATCH] remove warnings --- SocketIOClientSwift/SocketPacket.swift | 5 +---- SocketIOClientSwift/SwiftRegex.swift | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift index 52b155e..0f4260c 100644 --- a/SocketIOClientSwift/SocketPacket.swift +++ b/SocketIOClientSwift/SocketPacket.swift @@ -157,8 +157,6 @@ final class SocketPacket: CustomStringConvertible { } private func completeMessage(var message:String, ack:Bool = false) -> String { - var err:NSError? - if data == nil || data!.count == 0 { return message + "]" } else if !ack { @@ -171,8 +169,7 @@ final class SocketPacket: CustomStringConvertible { do { jsonSend = try NSJSONSerialization.dataWithJSONObject(arg, options: NSJSONWritingOptions(rawValue: 0)) - } catch var error as NSError { - err = error + } catch { jsonSend = nil } let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding) diff --git a/SocketIOClientSwift/SwiftRegex.swift b/SocketIOClientSwift/SwiftRegex.swift index dee77b2..fb306aa 100644 --- a/SocketIOClientSwift/SwiftRegex.swift +++ b/SocketIOClientSwift/SwiftRegex.swift @@ -24,15 +24,13 @@ public class SwiftRegex: NSObject, BooleanType { if let regex = swiftRegexCache[pattern] { self.regex = regex } else { - var error: NSError? do { let regex = try NSRegularExpression(pattern: pattern, options: NSRegularExpressionOptions.DotMatchesLineSeparators) swiftRegexCache[pattern] = regex self.regex = regex } catch let error1 as NSError { - error = error1 - SwiftRegex.failure("Error in pattern: \(pattern) - \(error)") + SwiftRegex.failure("Error in pattern: \(pattern) - \(error1)") self.regex = NSRegularExpression() } }