From 1f76dfcae4e97cc37602e43bb9668c2cca5037c3 Mon Sep 17 00:00:00 2001 From: Rui Peres Date: Sat, 21 Nov 2015 19:26:50 +0000 Subject: [PATCH] No need for force unwrap --- RxCocoa/Common/Observables/NSURLSession+Rx.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/RxCocoa/Common/Observables/NSURLSession+Rx.swift b/RxCocoa/Common/Observables/NSURLSession+Rx.swift index efe4b5d3..0c8456c2 100644 --- a/RxCocoa/Common/Observables/NSURLSession+Rx.swift +++ b/RxCocoa/Common/Observables/NSURLSession+Rx.swift @@ -117,7 +117,7 @@ extension NSURLSession { - returns: Observable sequence of URL responses. */ @warn_unused_result(message="http://git.io/rxs.uo") - public func rx_response(request: NSURLRequest) -> Observable<(NSData!, NSHTTPURLResponse)> { + public func rx_response(request: NSURLRequest) -> Observable<(NSData, NSHTTPURLResponse)> { return create { observer in // smart compiler should be able to optimize this out @@ -134,6 +134,8 @@ extension NSURLSession { print(convertURLRequestToCurlCommand(request)) print(convertResponseToString(data, response, error, interval)) } + + guard let response = response, data = data else { observer.on(.Error(error ?? RxCocoaURLError.Unknown)) @@ -145,7 +147,7 @@ extension NSURLSession { return } - observer.on(.Next(data as NSData!, httpResponse)) + observer.on(.Next(data, httpResponse)) observer.on(.Completed) }