From bc3f36f7549dad3e91387444aaace7e74dafb802 Mon Sep 17 00:00:00 2001 From: Nicholas Maccharoli Date: Sun, 25 Oct 2015 02:00:05 +0900 Subject: [PATCH] replace unnecessary usage of NSString with String --- Source/Request.swift | 2 +- Source/ResponseSerialization.swift | 2 +- Tests/ParameterEncodingTests.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Request.swift b/Source/Request.swift index b38f450..00932dc 100644 --- a/Source/Request.swift +++ b/Source/Request.swift @@ -518,7 +518,7 @@ extension Request: CustomDebugStringConvertible { if let HTTPBodyData = request.HTTPBody, - HTTPBody = NSString(data: HTTPBodyData, encoding: NSUTF8StringEncoding) + HTTPBody = String(data: HTTPBodyData, encoding: NSUTF8StringEncoding) { let escapedBody = HTTPBody.stringByReplacingOccurrencesOfString("\"", withString: "\\\"") components.append("-d \"\(escapedBody)\"") diff --git a/Source/ResponseSerialization.swift b/Source/ResponseSerialization.swift index b3c5ec9..9c4562b 100644 --- a/Source/ResponseSerialization.swift +++ b/Source/ResponseSerialization.swift @@ -204,7 +204,7 @@ extension Request { let actualEncoding = encoding ?? NSISOLatin1StringEncoding - if let string = NSString(data: validData, encoding: actualEncoding) as? String { + if let string = String(data: validData, encoding: actualEncoding) { return .Success(string) } else { let failureReason = "String could not be serialized with encoding: \(actualEncoding)" diff --git a/Tests/ParameterEncodingTests.swift b/Tests/ParameterEncodingTests.swift index 154fa8d..feeb6f6 100644 --- a/Tests/ParameterEncodingTests.swift +++ b/Tests/ParameterEncodingTests.swift @@ -401,7 +401,7 @@ class URLParameterEncodingTestCase: ParameterEncodingTestCase { if let HTTPBody = URLRequest.HTTPBody, - decodedHTTPBody = NSString(data: HTTPBody, encoding: NSUTF8StringEncoding) + decodedHTTPBody = String(data: HTTPBody, encoding: NSUTF8StringEncoding) { XCTAssertEqual(decodedHTTPBody, "bar=2&foo=1", "HTTPBody is incorrect") } else { -- GitLab