Fixes warnings and errors.

tottakai · Oct 19, 2016 · 3f5886e · 3f5886e
1 parent 10f82a0
commit 3f5886e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/RxCocoa/Common/TextInput.swift b/RxCocoa/Common/TextInput.swift
@@ -99,6 +99,10 @@ import Foundation
  }
  }
 
+ extension NSTextField : NSTextInput {
+
+ }
+
 #endif
 
 
diff --git a/RxCocoa/iOS/UIButton+Rx.swift b/RxCocoa/iOS/UIButton+Rx.swift
@@ -59,7 +59,7 @@ extension Reactive where Base: UIButton {
  /**
  Reactive wrapper for `setTitle(_:controlState:)`
  */
- public func title(controlState: UIControlState = []) -> UIBindingObserver<Base, String?> {
+ public func title(for controlState: UIControlState = []) -> UIBindingObserver<Base, String?> {
  return UIBindingObserver<Base, String?>(UIElement: self.base) { (button, title) -> () in
  button.setTitle(title, for: controlState)
  }

diff --git a/RxCocoa/iOS/UICollectionView+Rx.swift b/RxCocoa/iOS/UICollectionView+Rx.swift
@@ -300,7 +300,7 @@ extension Reactive where Base: UICollectionView {
  */
  public var didUpdateFocusInContextWithAnimationCoordinator: ControlEvent<(context: UIFocusUpdateContext, animationCoordinator: UIFocusAnimationCoordinator)> {
 
- let source = delegate.observe(#selector(UICollectionViewDelegate.collectionView(_:didUpdateFocusIn:with:)))
+ let source = delegate.methodInvoked(#selector(UICollectionViewDelegate.collectionView(_:didUpdateFocusIn:with:)))
  .map { a -> (context: UIFocusUpdateContext, animationCoordinator: UIFocusAnimationCoordinator) in
  let context = a[1] as! UIFocusUpdateContext
  let animationCoordinator = a[2] as! UIFocusAnimationCoordinator

diff --git a/RxCocoa/iOS/UITableView+Rx.swift b/RxCocoa/iOS/UITableView+Rx.swift
@@ -385,7 +385,7 @@ extension Reactive where Base: UITableView {
  */
  public var didUpdateFocusInContextWithAnimationCoordinator: ControlEvent<(context: UIFocusUpdateContext, animationCoordinator: UIFocusAnimationCoordinator)> {
 
- let source = delegate.observe(#selector(UITableViewDelegate.tableView(_:didUpdateFocusIn:with:)))
+ let source = delegate.methodInvoked(#selector(UITableViewDelegate.tableView(_:didUpdateFocusIn:with:)))
  .map { a -> (context: UIFocusUpdateContext, animationCoordinator: UIFocusAnimationCoordinator) in
  let context = a[1] as! UIFocusUpdateContext
  let animationCoordinator = try castOrThrow(UIFocusAnimationCoordinator.self, a[2])

diff --git a/Tests/RxCocoaTests/UITableView+RxTests.swift b/Tests/RxCocoaTests/UITableView+RxTests.swift
@@ -552,7 +552,7 @@ extension UITableViewTests {
  let dataSource = TableViewDataSourceThatImplementsCommitForRowAt()
  _ = tableView.rx.setDataSource(dataSource)
 
- XCTAssertTrue((tableView.dataSource! as! UITableViewDataSource).responds(to: #selector(UITableViewDataSource.tableView(_:commit:forRowAt:))))
+ XCTAssertTrue((tableView.dataSource!).responds(to: #selector(UITableViewDataSource.tableView(_:commit:forRowAt:))))
  }
 }
 

diff --git a/Tests/RxSwiftTests/Observable+SingleTest.swift b/Tests/RxSwiftTests/Observable+SingleTest.swift
@@ -289,7 +289,7 @@ extension ObservableSingleTest {
  var sum = 2 + 3 + 4 + 5
  let res = scheduler.start { xs.do(onNext: { element in
  i += 1
- sum -= element ?? 0
+ sum -= element
  })
  }