refactor RxMoya syntax

Author: jdisho

Sources/RxMoya/Observable+Response.swift

@@ -9,55 +9,39 @@ extension ObservableType where E == Response {
 
     /// Filters out responses that don't fall within the given range, generating errors when others are encountered.
     public func filter(statusCodes: ClosedRange<Int>) -> Observable<E> {
-        return flatMap { response -> Observable<E> in
-            return Observable.just(try response.filter(statusCodes: statusCodes))
-        }
+        return flatMap { Observable.just(try $0.filter(statusCodes: statusCodes)) }
     }
 
     public func filter(statusCode: Int) -> Observable<E> {
-        return flatMap { response -> Observable<E> in
-            return Observable.just(try response.filter(statusCode: statusCode))
-        }
+        return flatMap { Observable.just(try $0.filter(statusCode: statusCode)) }
     }
 
     public func filterSuccessfulStatusCodes() -> Observable<E> {
-        return flatMap { response -> Observable<E> in
-            return Observable.just(try response.filterSuccessfulStatusCodes())
-        }
+        return flatMap { Observable.just(try $0.filterSuccessfulStatusCodes()) }
     }
 
     public func filterSuccessfulStatusAndRedirectCodes() -> Observable<E> {
-        return flatMap { response -> Observable<E> in
-            return Observable.just(try response.filterSuccessfulStatusAndRedirectCodes())
-        }
+        return flatMap { Observable.just(try $0.filterSuccessfulStatusAndRedirectCodes()) }
     }
 
     /// Maps data received from the signal into an Image. If the conversion fails, the signal errors.
     public func mapImage() -> Observable<Image?> {
-        return flatMap { response -> Observable<Image?> in
-            return Observable.just(try response.mapImage())
-        }
+        return flatMap { Observable.just(try $0.mapImage()) }
     }
 
     /// Maps data received from the signal into a JSON object. If the conversion fails, the signal errors.
     public func mapJSON(failsOnEmptyData: Bool = true) -> Observable<Any> {
-        return flatMap { response -> Observable<Any> in
-            return Observable.just(try response.mapJSON(failsOnEmptyData: failsOnEmptyData))
-        }
+        return flatMap { Observable.just(try $0.mapJSON(failsOnEmptyData: failsOnEmptyData)) }
     }
 
     /// Maps received data at key path into a String. If the conversion fails, the signal errors.
     public func mapString(atKeyPath keyPath: String? = nil) -> Observable<String> {
-        return flatMap { response -> Observable<String> in
-            return Observable.just(try response.mapString(atKeyPath: keyPath))
-        }
+        return flatMap { Observable.just(try $0.mapString(atKeyPath: keyPath)) }
     }
 
     /// Maps received data at key path into a Decodable object. If the conversion fails, the signal errors.
     public func map<D: Decodable>(_ type: D.Type, atKeyPath keyPath: String? = nil, using decoder: JSONDecoder = JSONDecoder(), failsOnEmptyData: Bool = true) -> Observable<D> {
-        return flatMap { response -> Observable<D> in
-            return Observable.just(try response.map(type, atKeyPath: keyPath, using: decoder, failsOnEmptyData: failsOnEmptyData))
-        }
+        return flatMap { Observable.just(try $0.map(type, atKeyPath: keyPath, using: decoder, failsOnEmptyData: failsOnEmptyData)) }
     }
 }
 

Sources/RxMoya/Single+Response.swift

@@ -9,54 +9,38 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
 
     /// Filters out responses that don't fall within the given range, generating errors when others are encountered.
     public func filter(statusCodes: ClosedRange<Int>) -> Single<ElementType> {
-        return flatMap { response -> Single<ElementType> in
-            return Single.just(try response.filter(statusCodes: statusCodes))
-        }
+        return flatMap { .just(try $0.filter(statusCodes: statusCodes)) }
     }
 
     public func filter(statusCode: Int) -> Single<ElementType> {
-        return flatMap { response -> Single<ElementType> in
-            return Single.just(try response.filter(statusCode: statusCode))
-        }
+        return flatMap { .just(try $0.filter(statusCode: statusCode)) }
     }
 
     public func filterSuccessfulStatusCodes() -> Single<ElementType> {
-        return flatMap { response -> Single<ElementType> in
-            return Single.just(try response.filterSuccessfulStatusCodes())
-        }
+        return flatMap { .just(try $0.filterSuccessfulStatusCodes()) }
     }
 
     public func filterSuccessfulStatusAndRedirectCodes() -> Single<ElementType> {
-        return flatMap { response -> Single<ElementType> in
-            return Single.just(try response.filterSuccessfulStatusAndRedirectCodes())
-        }
+        return flatMap { .just(try $0.filterSuccessfulStatusAndRedirectCodes()) }
     }
 
     /// Maps data received from the signal into an Image. If the conversion fails, the signal errors.
     public func mapImage() -> Single<Image?> {
-        return flatMap { response -> Single<Image?> in
-            return Single.just(try response.mapImage())
-        }
+        return flatMap { .just(try $0.mapImage()) }
     }
 
     /// Maps data received from the signal into a JSON object. If the conversion fails, the signal errors.
     public func mapJSON(failsOnEmptyData: Bool = true) -> Single<Any> {
-        return flatMap { response -> Single<Any> in
-            return Single.just(try response.mapJSON(failsOnEmptyData: failsOnEmptyData))
-        }
+        return flatMap { .just(try $0.mapJSON(failsOnEmptyData: failsOnEmptyData)) }
     }
 
     /// Maps received data at key path into a String. If the conversion fails, the signal errors.
     public func mapString(atKeyPath keyPath: String? = nil) -> Single<String> {
-        return flatMap { response -> Single<String> in
-            return Single.just(try response.mapString(atKeyPath: keyPath))
-        }
+        return flatMap { .just(try $0.mapString(atKeyPath: keyPath)) }
     }
 
     /// Maps received data at key path into a Decodable object. If the conversion fails, the signal errors.
     public func map<D: Decodable>(_ type: D.Type, atKeyPath keyPath: String? = nil, using decoder: JSONDecoder = JSONDecoder(), failsOnEmptyData: Bool = true) -> Single<D> {
-        return flatMap { response -> Single<D> in
-            return Single.just(try response.map(type, atKeyPath: keyPath, using: decoder, failsOnEmptyData: failsOnEmptyData))
-        }
+        return flatMap { .just(try $0.map(type, atKeyPath: keyPath, using: decoder, failsOnEmptyData: failsOnEmptyData)) }
     }
 }