diff --git a/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaPage.swift b/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaPage.swift index 4160f139..6f131520 100644 --- a/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaPage.swift +++ b/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaPage.swift @@ -24,7 +24,7 @@ struct WikipediaPage { let text = json.valueForKey("parse")?.valueForKey("text")?.valueForKey("*") as? String if title == nil || text == nil { - return .Error(apiError("Error parsing page content")) + return failure(apiError("Error parsing page content")) } return success(WikipediaPage(title: title!, text: text!)) diff --git a/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift b/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift index b543b63f..f773d3d5 100644 --- a/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift +++ b/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift @@ -27,13 +27,13 @@ struct WikipediaSearchResult: Printable { .map { $0! } if rootArrayTyped.count != 3 { - return .Error(WikipediaParseError) + return failure(WikipediaParseError) } let titleAndDescription = Array(Zip2(rootArrayTyped[0], rootArrayTyped[1])) let titleDescriptionAndUrl: [((AnyObject, AnyObject), AnyObject)] = Array(Zip2(titleAndDescription, rootArrayTyped[2])) - let searchResults: [Result] = titleDescriptionAndUrl.map ( { result -> RxResult in + let searchResults: [RxResult] = titleDescriptionAndUrl.map ( { result -> RxResult in let ((title: AnyObject, description: AnyObject), url: AnyObject) = result let titleString = title as? String, @@ -41,18 +41,18 @@ struct WikipediaSearchResult: Printable { urlString = url as? String if titleString == nil || descriptionString == nil || urlString == nil { - return .Error(WikipediaParseError) + return failure(WikipediaParseError) } let URL = NSURL(string: urlString!) if URL == nil { - return .Error(WikipediaParseError) + return failure(WikipediaParseError) } return success(WikipediaSearchResult(title: titleString!, description: descriptionString!, URL: URL!)) }) - let values = (searchResults.filter { $0.value != nil }).map { *$0 } + let values = (searchResults.filter { $0.isSuccess }).map { $0.get() } return success(values) } diff --git a/RxExample/RxExample/Services/ImageService.swift b/RxExample/RxExample/Services/ImageService.swift index 5baf9461..92a1537c 100644 --- a/RxExample/RxExample/Services/ImageService.swift +++ b/RxExample/RxExample/Services/ImageService.swift @@ -45,7 +45,7 @@ class DefaultImageService: ImageService { if maybeImage == nil { // some error - return .Error(apiError("Decoding image error")) + return failure(apiError("Decoding image error")) } let image = maybeImage!