From 6757b8287262b14178d0fa6b2286fde01e495c17 Mon Sep 17 00:00:00 2001 From: Lee Sun-Hyoup Date: Thu, 7 Jul 2016 18:53:59 +0900 Subject: [PATCH 1/4] Remove typealias Parent line in Filter.swift --- RxSwift/Observables/Implementations/Filter.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/RxSwift/Observables/Implementations/Filter.swift b/RxSwift/Observables/Implementations/Filter.swift index b78fafb3..9adb0b28 100644 --- a/RxSwift/Observables/Implementations/Filter.swift +++ b/RxSwift/Observables/Implementations/Filter.swift @@ -12,8 +12,6 @@ class FilterSink: Sink, ObserverType { typealias Predicate = (Element) throws -> Bool typealias Element = O.E - typealias Parent = Filter - private let _predicate: Predicate init(predicate: Predicate, observer: O) { From f303efb0779b86be814e8b80bc4ee9e5677db9bf Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Wed, 27 Jul 2016 04:15:17 +0900 Subject: [PATCH 2/4] Fix type mismatch in UITableView.rx_willDisplayCell --- RxCocoa/iOS/UITableView+Rx.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RxCocoa/iOS/UITableView+Rx.swift b/RxCocoa/iOS/UITableView+Rx.swift index 8b1472c1..d51621e5 100644 --- a/RxCocoa/iOS/UITableView+Rx.swift +++ b/RxCocoa/iOS/UITableView+Rx.swift @@ -214,7 +214,7 @@ extension UITableView { Reactive wrapper for `delegate` message `tableView:willDisplayCell:forRowAtIndexPath:`. */ public var rx_willDisplayCell: ControlEvent { - let source: Observable = rx_delegate.observe(#selector(UITableViewDelegate.tableView(_:willDisplayCell:forRowAtIndexPath:))) + let source: Observable = rx_delegate.observe(#selector(UITableViewDelegate.tableView(_:willDisplayCell:forRowAtIndexPath:))) .map { a in return (try castOrThrow(UITableViewCell.self, a[1]), try castOrThrow(NSIndexPath.self, a[2])) } From 40eb4520406ef05a42d634e550f3945c6888130e Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Thu, 28 Jul 2016 18:06:29 -0300 Subject: [PATCH 3/4] Update Contents.swift Typo fixed - it was missing the `ed` in called. --- .../Pages/Introduction.xcplaygroundpage/Contents.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift index 36f2faa0..84776796 100644 --- a/Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Introduction.xcplaygroundpage/Contents.swift @@ -44,7 +44,7 @@ All of these various systems makes our code needlessly complex. Wouldn't it be b `--tap--tap----------tap--> // "|" = Continues indefinitely, such as a sequence of button taps` - > These diagrams are call marble diagrams. You can learn more about them at [RxMarbles.com](http://rxmarbles.com). + > These diagrams are called marble diagrams. You can learn more about them at [RxMarbles.com](http://rxmarbles.com). */ /*: ### Observables and observers (aka subscribers) From dffd6f0e1cca0b8bb196cb54909b82686b30b7e2 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Mon, 1 Aug 2016 10:18:11 +0200 Subject: [PATCH 4/4] Moves playgrounds from workspace to project. #806 --- Rx.xcodeproj/project.pbxproj | 2 ++ Rx.xcworkspace/contents.xcworkspacedata | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Rx.xcodeproj/project.pbxproj b/Rx.xcodeproj/project.pbxproj index 3ba598d0..701b707f 100644 --- a/Rx.xcodeproj/project.pbxproj +++ b/Rx.xcodeproj/project.pbxproj @@ -1715,6 +1715,7 @@ C8C4B4C01C17727000828BD5 /* MessageSentObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageSentObserver.swift; sourceTree = ""; }; C8D132431C42D15E00B59FFF /* SectionedViewDataSourceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionedViewDataSourceType.swift; sourceTree = ""; }; C8D132521C42DA7F00B59FFF /* SectionedViewDataSourceMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionedViewDataSourceMock.swift; sourceTree = ""; }; + C8D2C1501D4F3CD6006E2431 /* Rx.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Rx.playground; sourceTree = ""; }; C8DB967D1BF7496C0084BD53 /* KVORepresentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KVORepresentable.swift; sourceTree = ""; }; C8DB96821BF754C80084BD53 /* NSObject+Rx+KVORepresentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSObject+Rx+KVORepresentable.swift"; sourceTree = ""; }; C8DB96871BF756F40084BD53 /* KVORepresentable+CoreGraphics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "KVORepresentable+CoreGraphics.swift"; sourceTree = ""; }; @@ -2513,6 +2514,7 @@ C8A56ACD1AD7424700B4673B = { isa = PBXGroup; children = ( + C8D2C1501D4F3CD6006E2431 /* Rx.playground */, C8093C471B8A72BE0088E94D /* RxSwift */, C8093F571B8A73A20088E94D /* RxBlocking */, C8093E801B8A732E0088E94D /* RxCocoa */, diff --git a/Rx.xcworkspace/contents.xcworkspacedata b/Rx.xcworkspace/contents.xcworkspacedata index f08b0831..1d0c2b1b 100644 --- a/Rx.xcworkspace/contents.xcworkspacedata +++ b/Rx.xcworkspace/contents.xcworkspacedata @@ -128,9 +128,6 @@ location = "group:Warnings.md"> - -