Merge pull request #4 from ikesyo/early-termination

[RFC] Style: Early termination instead of using var

Author: ishkawa

APIKit/RequestBodyBuilder.swift

@@ -25,30 +25,25 @@ public enum RequestBodyBuilder {
     }
 
     public func buildBodyFromObject(object: AnyObject) -> Result<NSData, NSError> {
-        var result: Result<NSData, NSError>
-
         switch self {
         case .JSON(let writingOptions):
             if !NSJSONSerialization.isValidJSONObject(object) {
                 let userInfo = [NSLocalizedDescriptionKey: "invalid object for JSON passed."]
                 let error = NSError(domain: APIKitRequestBodyBuidlerErrorDomain, code: 0, userInfo: userInfo)
-                result = failure(error)
-                break
+                return failure(error)
             }
 
-            result = try { error in
+            return try { error in
                 return NSJSONSerialization.dataWithJSONObject(object, options: writingOptions, error: error)
             }
 
         case .URL(let encoding):
-            result = try { error in
+            return try { error in
                 return URLEncodedSerialization.dataFromObject(object, encoding: encoding, error: error)
             }
 
         case .Custom(let (_, buildBodyFromObject)):
-            result = buildBodyFromObject(object)
+            return buildBodyFromObject(object)
         }
-
-        return result
     }
 }

APIKit/ResponseBodyParser.swift

@@ -23,25 +23,19 @@ public enum ResponseBodyParser {
     }
 
     public func parseData(data: NSData) -> Result<AnyObject, NSError> {
-        var result: Result<AnyObject, NSError>
-
         switch self {
         case .JSON(let readingOptions):
-            result = try { error in
+            return try { error in
                 return NSJSONSerialization.JSONObjectWithData(data, options: readingOptions, error: error)
             }
 
         case .URL(let encoding):
-            result = try { error in
+            return try { error in
                 return URLEncodedSerialization.objectFromData(data, encoding: encoding, error: error)
             }
 
         case .Custom(let (accept, parseData)):
-            result = parseData(data)
+            return parseData(data)
         }
-
-        return result
     }
-    
-    
 }