Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pr 2135 #2

Closed
wants to merge 5 commits into from
Closed

Pr 2135 #2

wants to merge 5 commits into from

Conversation

trxcllnt
Copy link
Collaborator

fixes lint issue and rebased from master

jayphelps and others added 5 commits November 29, 2016 00:28
…heir scheduled work.

VirtualActions are immutable so they can be inspected by the TestScheduler. In order to mirror

rescheduled stateful Actions, rescheduled VirtualActions shouldn't execute if they've been

rescheduled before execution.
…ed timeout actions.

The timeout and timeoutWith operators should dispose their scheduled timeout actions on

unsubscription. Also, given the new scheduling architecture, they can recycle their scheduled

actions so just one action is allocated per subscription.
@jayphelps
Copy link
Owner

can't merge this as-is, conflicts. I can do the rebase separately..how did you solve the Unused method: '_unsubscribe' lint errors?

@jayphelps
Copy link
Owner

jayphelps commented Nov 29, 2016

Found it. changing private -> protected. I've rebased and made that change to the PR ReactiveX#2135

For some reason, my updated branch resolved the merge conflicts with this PR...dunno why.

@jayphelps jayphelps closed this Nov 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants