Fix Handle::timeout #1093
Merged
Fix Handle::timeout #1093
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
The old implementation didn't work for Timeout<Stream>, since the method took a deadline rather than a timeout.
|
Master is now ready for breaking changes, so I'd happily merge, but I want to better understand: what was wrong originally? |
|
|
|
Ohhhh, got it! |
seanmonstar
reviewed
May 31, 2019
| Some(ref handle_priv) => Delay::new_with_handle(deadline, handle_priv.clone()), | ||
| None => Delay::new(deadline), | ||
| Some(ref handle_priv) => { | ||
| Delay::new_with_handle(deadline, Duration::from_secs(0), handle_priv.clone()) |
There was a problem hiding this comment.
Should this pass the above duration, instead of creating a 0?
There was a problem hiding this comment.
The second duration there is the magic reset interval that's used by Timeout<Stream>. Delay's normal public constructor sets it to 0 as well.
carllerche
approved these changes
Jul 8, 2019
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.
Motivation
The old implementation didn't work for Timeout, since the method
took a deadline rather than a timeout.
Solution
timeoutnow takes aDurationrather thanInstant, and plumbs things through so that the inner Delay will be reset appropriately. This is a breaking change, so it shouldn't be backported to 1.x