浏览代码

replace unnecessary usage of NSString with String

Nicholas Maccharoli 10 年之前
父节点
当前提交
bc3f36f754
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      Source/Request.swift
  2. 1 1
      Source/ResponseSerialization.swift
  3. 1 1
      Tests/ParameterEncodingTests.swift

+ 1 - 1
Source/Request.swift

@@ -518,7 +518,7 @@ extension Request: CustomDebugStringConvertible {
 
 
         if let
         if let
             HTTPBodyData = request.HTTPBody,
             HTTPBodyData = request.HTTPBody,
-            HTTPBody = NSString(data: HTTPBodyData, encoding: NSUTF8StringEncoding)
+            HTTPBody = String(data: HTTPBodyData, encoding: NSUTF8StringEncoding)
         {
         {
             let escapedBody = HTTPBody.stringByReplacingOccurrencesOfString("\"", withString: "\\\"")
             let escapedBody = HTTPBody.stringByReplacingOccurrencesOfString("\"", withString: "\\\"")
             components.append("-d \"\(escapedBody)\"")
             components.append("-d \"\(escapedBody)\"")

+ 1 - 1
Source/ResponseSerialization.swift

@@ -204,7 +204,7 @@ extension Request {
 
 
             let actualEncoding = encoding ?? NSISOLatin1StringEncoding
             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)
                 return .Success(string)
             } else {
             } else {
                 let failureReason = "String could not be serialized with encoding: \(actualEncoding)"
                 let failureReason = "String could not be serialized with encoding: \(actualEncoding)"

+ 1 - 1
Tests/ParameterEncodingTests.swift

@@ -401,7 +401,7 @@ class URLParameterEncodingTestCase: ParameterEncodingTestCase {
 
 
         if let
         if let
             HTTPBody = URLRequest.HTTPBody,
             HTTPBody = URLRequest.HTTPBody,
-            decodedHTTPBody = NSString(data: HTTPBody, encoding: NSUTF8StringEncoding)
+            decodedHTTPBody = String(data: HTTPBody, encoding: NSUTF8StringEncoding)
         {
         {
             XCTAssertEqual(decodedHTTPBody, "bar=2&foo=1", "HTTPBody is incorrect")
             XCTAssertEqual(decodedHTTPBody, "bar=2&foo=1", "HTTPBody is incorrect")
         } else {
         } else {