This repository has been archived by the owner on Sep 13, 2018. It is now read-only.
Update for changes in tokio-core/futures #74
Closed
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
Remove the vendored Sink implementation as it's now taken care of
Replace Transport with Stream+Sink
Hoverbear
reviewed
Nov 23, 2016
| @@ -24,34 +24,34 @@ pub struct Client<R1, R2, B1, B2, E> | |||
| where B1: Stream<Error = E>, | |||
| E: From<Error<E>>, | |||
| { | |||
| tx: RefCell<Sender<Envelope<R1, R2, B1, B2, E>, io::Error>>, | |||
| tx: RefCell<spsc::Sender<Envelope<R1, R2, B1, B2, E>, io::Error>>, | |||
There was a problem hiding this comment.
spsc<T,E> is now mpsc<T>
| @@ -23,7 +23,7 @@ | |||
| use std::io; | |||
There was a problem hiding this comment.
This files documentation still talks about FramedIo despite it being removed.
|
Oh I'm going to close this in favor of #75, and will soon push commits to fix tests there too. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This updates tokio-proto with the changes we've been pushing through tokio-core/futures. Primarily the
FramedIotrait in tokio-core was deprecated, leading do the deletion of theTransporttraits in tokio-proto with the replacement ofSink + Stream.All various bits and pieces have been updated and plumbed together to get this to work out, and the tests should be passing at least sometimes (they're still sorta flaky)