TouchInstinct
/
RxSwift
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Errors in examples for xcode 7 beta 4

This commit is contained in:
Gareth Knowles 2015-07-22 10:41:23 +01:00
parent 470d56a3e9
commit eeffac4502
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RxDataSourceStarterKit/SectionModel.swift
View File

@ -9,7 +9,7 @@
import Foundation
public struct SectionModel<Section, ItemType> : SectionModelType, CustomStringConvertible {
typealias Item = ItemType
public typealias Item = ItemType
public var model: Section
public var items: [Item]
@ -32,7 +32,7 @@ public struct SectionModel<Section, ItemType> : SectionModelType, CustomStringCo
}
public struct HashableSectionModel<Section: Hashable, ItemType: Hashable> : Hashable, SectionModelType, CustomStringConvertible {
typealias Item = ItemType
public typealias Item = ItemType
public var model: Section
public var items: [Item]

4
RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift
View File

@ -30,8 +30,8 @@ struct WikipediaSearchResult: CustomStringConvertible {
return failure(WikipediaParseError)
}
let titleAndDescription = Array(Zip2(rootArrayTyped[0], rootArrayTyped[1]))
let titleDescriptionAndUrl: [((AnyObject, AnyObject), AnyObject)] = Array(Zip2(titleAndDescription, rootArrayTyped[2]))
let titleAndDescription = Array(Zip2Sequence(rootArrayTyped[0], rootArrayTyped[1]))
let titleDescriptionAndUrl: [((AnyObject, AnyObject), AnyObject)] = Array(Zip2Sequence(titleAndDescription, rootArrayTyped[2]))
let searchResults: [RxResult<WikipediaSearchResult>] = titleDescriptionAndUrl.map ( { result -> RxResult<WikipediaSearchResult> in
let (first, url) = result