consistent whitespace before argument and variable types

lixin1988 · Jul 7, 2016 · 69e4ded · 69e4ded
1 parent 6450491
commit 69e4ded
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/Demo/Demo/GitHubAPI.swift b/Demo/Demo/GitHubAPI.swift
@@ -53,7 +53,7 @@ extension GitHub: TargetType {
             return nil
         }
     }
-    public var multipartBody:[MultipartFormData]? {
+    public var multipartBody: [MultipartFormData]? {
         return nil
     }
     public var sampleData: NSData {

diff --git a/Demo/Tests/MoyaProviderSpec.swift b/Demo/Tests/MoyaProviderSpec.swift
@@ -277,7 +277,7 @@ class MoyaProviderSpec: QuickSpec {
                 var path = "/endpoint"
                 var method = Moya.Method.GET
                 var parameters: [String: AnyObject]? = ["key": "value"]
-                var multipartBody:[Moya.MultipartFormData]? = []
+                var multipartBody: [Moya.MultipartFormData]? = []
                 var sampleData = ("sample data" as NSString).dataUsingEncoding(NSUTF8StringEncoding)!
             }
 

diff --git a/Demo/Tests/TestHelpers.swift b/Demo/Tests/TestHelpers.swift
@@ -31,7 +31,7 @@ extension GitHub: TargetType {
         return nil
     }
 
-    var multipartBody:[MultipartFormData]? {
+    var multipartBody: [MultipartFormData]? {
         return nil
     }
 
@@ -76,7 +76,7 @@ enum HTTPBin: TargetType {
         }
     }
 
-    var multipartBody:[MultipartFormData]? {
+    var multipartBody: [MultipartFormData]? {
         return nil
     }
 

diff --git a/Source/Moya.swift b/Source/Moya.swift
@@ -5,7 +5,7 @@ import Result
 public typealias Completion = (result: Result<Moya.Response, Moya.Error>) -> ()
 
 /// Closure to be executed when a request has completed.
-public typealias ProgressBlock = (progress:ProgressResponse) -> Void
+public typealias ProgressBlock = (progress: ProgressResponse) -> Void
 
 public struct ProgressResponse {
     public let totalBytes: Int64
@@ -268,7 +268,7 @@ public class MoyaProvider<Target: TargetType> {
 
             switch stubBehavior {
             case .Never:
-                cancellableToken = self.sendUpload(target, request: request, queue: queue, multipartBody: multipartBody, progress:progress, completion: { result in
+                cancellableToken = self.sendUpload(target, request: request, queue: queue, multipartBody: multipartBody, progress: progress, completion: { result in
                     if self.trackInflights {
                         self.inflightRequests[endpoint]?.forEach({ $0(result: result) })
 
@@ -301,7 +301,7 @@ public class MoyaProvider<Target: TargetType> {
 
     /// Designated request-making method. Returns a Cancellable token to cancel the request later.
     public func request(target: Target, completion: Moya.Completion) -> Cancellable {
-        return self.request(target, queue:nil, completion:completion)
+        return self.request(target, queue: nil, completion: completion)
     }
 
     /// When overriding this method, take care to `notifyPluginsOfImpendingStub` and to perform the stub using the `createStubFunction` method.
@@ -375,11 +375,11 @@ public extension MoyaProvider {
 
 internal extension MoyaProvider {
 
-    private func sendUpload(target: Target, request:NSURLRequest, queue: dispatch_queue_t?, multipartBody:[MultipartFormData], progress: Moya.ProgressBlock? = nil, completion: Moya.Completion) -> CancellableWrapper {
+    private func sendUpload(target: Target, request: NSURLRequest, queue: dispatch_queue_t?, multipartBody:[MultipartFormData], progress: Moya.ProgressBlock? = nil, completion: Moya.Completion) -> CancellableWrapper {
         var cancellable = CancellableWrapper()
         let plugins = self.plugins
 
-        let multipartFormData = { (form:RequestMultipartFormData) -> Void in
+        let multipartFormData = { (form: RequestMultipartFormData) -> Void in
             for bodyPart in multipartBody {
                 switch bodyPart.provider {
                 case .Data(let data):
@@ -400,7 +400,7 @@ internal extension MoyaProvider {
             }
         }
 
-        manager.upload(request, multipartFormData: multipartFormData) {(result:MultipartFormDataEncodingResult) in
+        manager.upload(request, multipartFormData: multipartFormData) {(result: MultipartFormDataEncodingResult) in
             switch result {
             case .Success(let alamoRequest, _, _):
                 // Give plugins the chance to alter the outgoing request
@@ -409,7 +409,7 @@ internal extension MoyaProvider {
                 // Perform the actual request
                 alamoRequest
                     .progress { (bytesWritten, totalBytesWritten, totalBytesExpected) in
-                        progress?(progress:ProgressResponse(totalBytes: totalBytesWritten, bytesExpected: totalBytesExpected))
+                        progress?(progress: ProgressResponse(totalBytes: totalBytesWritten, bytesExpected: totalBytesExpected))
                     }
                     .response(queue: queue) { (_, response: NSHTTPURLResponse?, data: NSData?, error: NSError?) -> () in
                         let result = convertResponseToResult(response, data: data, error: error)

diff --git a/Source/ReactiveCocoa/Moya+ReactiveCocoa.swift b/Source/ReactiveCocoa/Moya+ReactiveCocoa.swift
@@ -65,7 +65,7 @@ public class ReactiveCocoaMoyaProvider<Target where Target: TargetType>: MoyaPro
 public extension ReactiveCocoaMoyaProvider {
     public func requestWithProgress(token: Target) -> SignalProducer<ProgressResponse, Error> {
         let progressBlock = { (observer: Signal<ProgressResponse, Error>.Observer) -> (ProgressResponse) -> Void in
-            return { (progress:ProgressResponse) in
+            return { (progress: ProgressResponse) in
                 observer.sendNext(progress)
             }
         }

diff --git a/Source/RxSwift/Moya+RxSwift.swift b/Source/RxSwift/Moya+RxSwift.swift
@@ -38,17 +38,17 @@ public class RxMoyaProvider<Target where Target: TargetType>: MoyaProvider<Targe
 
 public extension RxMoyaProvider {
     public func requestWithProgress(token: Target) -> Observable<ProgressResponse> {
-        let progressBlock = { (observer:AnyObserver) -> (ProgressResponse) -> Void in
-            return { (progress:ProgressResponse) in
+        let progressBlock = { (observer: AnyObserver) -> (ProgressResponse) -> Void in
+            return { (progress: ProgressResponse) in
                 observer.onNext(progress)
             }
         }
 
-        let response:Observable<ProgressResponse> = Observable.create { [weak self] observer in
-            let cancellableToken = self?.request(token, queue:nil, progress:progressBlock(observer)){ result in
+        let response: Observable<ProgressResponse> = Observable.create { [weak self] observer in
+            let cancellableToken = self?.request(token, queue: nil, progress: progressBlock(observer)){ result in
                 switch result {
                 case let .Success(response):
-                    observer.onNext(ProgressResponse(response:response))
+                    observer.onNext(ProgressResponse(response: response))
                     observer.onCompleted()
                     break
                 case let .Failure(error):