Remove CompositeDisposable.DisposableHandle.
#363
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mdiep
requested changes
May 10, 2017
Sources/Disposable.swift
Outdated
| return DisposableHandle.empty | ||
| return disposable.flatMap { disposable in | ||
| return disposables.modify { disposables in | ||
| let token = disposables!.insert(disposable) |
There was a problem hiding this comment.
I don't think this ! is safe. This could have been disposed between the above check and here.
Sources/Disposable.swift
Outdated
| } else { | ||
| d.dispose() | ||
| return DisposableHandle.empty | ||
| return disposable.flatMap { disposable in |
There was a problem hiding this comment.
I think the previous guard structure is preferable to disposable.flatMap to reduce the nesting by a level.
| public func add(_ d: Disposable?) -> DisposableHandle { | ||
| guard let d = d else { | ||
| return DisposableHandle.empty | ||
| public func add(_ disposable: Disposable?) -> Disposable? { |
There was a problem hiding this comment.
We could leave this as non-optional by returning a disposable that does nothing. I'm not sure which would be better. Is there a particular reason you decided to return an optional?
There was a problem hiding this comment.
It follows the precedence of Signal.observe, and the fact that CompositeDisposable.add accepts Disposable?.
andersio
force-pushed
the
remove-disposable-handle
branch
from
5d13e52
to
81d0409
Compare
The disposable array can be cleared at any time, since the disposal may happen after checking `isDisposed` but before accessing `disposables`.
andersio
force-pushed
the
remove-disposable-handle
branch
from
81d0409
to
5ae1247
Compare
mdiep
approved these changes
May 11, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picked from #334.
Use
ActionDisposableinstead, akin toSignal.observe.