Merge pull request #641 from ReactiveX/partial-application

Use partial application with AnonymousDisposable if possible
This commit is contained in:
Krunoslav Zaher 2016-04-24 15:42:17 +02:00
commit a96321638a
7 changed files with 8 additions and 24 deletions

View File

@ -42,9 +42,7 @@ class KVOObservable<Element>
observer.on(.Next(value as? Element))
}
return AnonymousDisposable {
observer.dispose()
}
return AnonymousDisposable(observer.dispose)
}
}

View File

@ -155,9 +155,7 @@ extension NSURLSession {
let t = task
t.resume()
return AnonymousDisposable {
task.cancel()
}
return AnonymousDisposable(task.cancel)
}
}

View File

@ -53,9 +53,7 @@ extension UIControl {
observer.on(.Next())
}
return AnonymousDisposable {
controlTarget.dispose()
}
return AnonymousDisposable(controlTarget.dispose)
}.takeUntil(rx_deallocated)
return ControlEvent(events: source)
@ -80,9 +78,7 @@ extension UIControl {
}
}
return AnonymousDisposable {
controlTarget.dispose()
}
return AnonymousDisposable(controlTarget.dispose)
}
.takeUntil((control as! NSObject).rx_deallocated)

View File

@ -35,8 +35,6 @@ extension ImmediateSchedulerType {
recursiveScheduler.schedule(state)
return AnonymousDisposable {
recursiveScheduler.dispose()
}
return AnonymousDisposable(recursiveScheduler.dispose)
}
}

View File

@ -73,8 +73,6 @@ extension SchedulerType {
scheduler.schedule(state, dueTime: dueTime)
return AnonymousDisposable {
scheduler.dispose()
}
return AnonymousDisposable(scheduler.dispose)
}
}

View File

@ -142,8 +142,6 @@ public class CurrentThreadScheduler : ImmediateSchedulerType {
// In Xcode 7.3, `return scheduledItem` causes segmentation fault 11 on release build.
// To workaround this compiler issue, returns AnonymousDisposable that disposes scheduledItem.
return AnonymousDisposable {
scheduledItem.dispose()
}
return AnonymousDisposable(scheduledItem.dispose)
}
}

View File

@ -49,9 +49,7 @@ public class OperationQueueScheduler: ImmediateSchedulerType {
self.operationQueue.addOperation(operation)
compositeDisposable.addDisposable(AnonymousDisposable {
operation.cancel()
})
compositeDisposable.addDisposable(AnonymousDisposable(operation.cancel))
return compositeDisposable
}