Idiomatification of Swift syntax.

Author: ashfurrow

Demo/ViewController.swift

@@ -83,12 +83,12 @@ class ViewController: UIViewController {
             })
             .addDisposableTo(self.disposableBag)
 
-        button1.rx.bindToAction(sharedAction, input: .button("Button 1"))
+        button1.rx.bindTo(action: sharedAction, input: .button("Button 1"))
 
-        button2.rx.bindToAction(sharedAction) { _ in
+        button2.rx.bindTo(action: sharedAction) { _ in
             return .button("Button 2")
         }
-        self.navigationItem.leftBarButtonItem?.rx.bindToAction(sharedAction, input: .barButton)
+        self.navigationItem.leftBarButtonItem?.rx.bindTo(action: sharedAction, input: .barButton)
 
         sharedAction.executing.debounce(0, scheduler: MainScheduler.instance).subscribe(onNext: { [weak self] executing in
             if (executing) {

Sources/Action/UIKitExtensions/UIBarButtonItem+Action.swift

@@ -38,7 +38,7 @@ public extension Reactive where Base: UIBarButtonItem {
         }
     }
 
-    public func bindToAction<Input, Output>(_ action: Action<Input, Output>?, _ inputTransform: @escaping (Base) -> (Input)) {
+    public func bindTo<Input, Output>(action: Action<Input, Output>?, inputTransform: @escaping (Base) -> (Input)) {
         self.base.resetActionDisposeBag()
 
         guard let action = action else {
@@ -56,8 +56,8 @@ public extension Reactive where Base: UIBarButtonItem {
             .addDisposableTo(self.base.actionDisposeBag)
     }
 
-    public func bindToAction<Input, Output>(_ action: Action<Input,Output>?, input: Input) {
-        self.bindToAction(action) { _ in input}
+    public func bindTo<Input, Output>(action: Action<Input,Output>?, input: Input) {
+        self.bindTo(action: action) { _ in input}
     }
 
 }

Sources/Action/UIKitExtensions/UIButton+Rx.swift

@@ -55,7 +55,7 @@ public extension Reactive where Base: UIButton {
     /// Binds enabled state of action to button, and subscribes to rx_tap to execute action with given input transform.
     /// These subscriptions are managed in a private, inaccessible dispose bag. To cancel
     /// them, call bindToAction with another action or nil.
-    public func bindToAction<Input, Output>(_ action:Action<Input,Output>?, _ inputTransform: @escaping (Base) -> (Input))   {
+    public func bindTo<Input, Output>(action:Action<Input,Output>?, inputTransform: @escaping (Base) -> (Input))   {
         // This effectively disposes of any existing subscriptions.
 
         // Technically, this file is only included on tv/iOS platforms,
@@ -71,14 +71,14 @@ public extension Reactive where Base: UIButton {
         guard let controlEvent = lookupControlEvent else {
             return
         }
-        self.bindToAction(action, controlEvent: controlEvent, inputTransform)
+        self.bindTo(action: action, controlEvent: controlEvent, inputTransform: inputTransform)
     }
 
     /// Binds enabled state of action to button, and subscribes to rx_tap to execute action with given input value.
     /// These subscriptions are managed in a private, inaccessible dispose bag. To cancel
     /// them, call bindToAction with another action or nil.
-    public func bindToAction<Input, Output>(_ action:Action<Input,Output>?, input:Input) {
-        self.bindToAction(action) { _ in return input }
+    public func bindTo<Input, Output>(action: Action<Input,Output>?, input: Input) {
+        self.bindTo(action: action) { _ in input }
     }
 }
 #endif

Sources/Action/UIKitExtensions/UIControl+Rx.swift

@@ -7,7 +7,7 @@ public extension Reactive where Base: UIControl {
     /// Binds enabled state of action to control, and subscribes action's execution to provided controlEvents.
     /// These subscriptions are managed in a private, inaccessible dispose bag. To cancel
     /// them, set the rx.action to nil or another action.
-    public func bindToAction <Input,Output>(_ action: Action<Input,Output>?, controlEvent: ControlEvent<Void>, _ inputTransform: @escaping (Base) -> (Input))   {
+    public func bindTo<Input,Output>(action: Action<Input,Output>?, controlEvent: ControlEvent<Void>, inputTransform: @escaping (Base) -> (Input))   {
         // This effectively disposes of any existing subscriptions.
         self.base.resetActionDisposeBag()
 

Tests/ActionTests/BindToTests.swift

@@ -26,7 +26,7 @@ class BindToTests: QuickSpec {
                 called = true
                 return .empty()
             })
-            button.rx.bindToAction(action, input: "Hi there!")
+            button.rx.bindTo(action: action, input: "Hi there!")
             // Setting the action has an asynchronous effect of adding a target.
             expect(button.allTargets).toEventuallyNot( beEmpty() )
 
@@ -42,7 +42,7 @@ class BindToTests: QuickSpec {
                 called = true
                 return .empty()
             })
-            button.rx.bindToAction(action, controlEvent: button.rx.tap, { input in "\(input)" })
+            button.rx.bindTo(action: action, controlEvent: button.rx.tap, inputTransform: { input in "\(input)" })
             // Setting the action has an asynchronous effect of adding a target.
             expect(button.allTargets).toEventuallyNot( beEmpty() )
 
@@ -58,7 +58,7 @@ class BindToTests: QuickSpec {
                 called = true
                 return .empty()
             })
-            item.rx.bindToAction(action, input: "Hi there!")
+            item.rx.bindTo(action: action, input: "Hi there!")
 
             _ = item.target!.perform(item.action!, with: item)