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

Add tokio support. #111

Merged
merged 52 commits into from
May 29, 2017
Merged

Conversation

illegalprime
Copy link
Collaborator

@illegalprime illegalprime commented Apr 4, 2017

This will let us have efficient servers and be able to multiplex ordinarily blocking code.
Fixes #88 and will help with servo/servo#16236

src/stream.rs Outdated
@@ -49,6 +57,7 @@ impl<R, W> Splittable for ReadWritePair<R, W>
}
}

#[cfg(not(feature="async"))]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That means the async feature isn't additive, no?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nox I wish this would work but I'm currently trying to figure out a way to get both (I mean it's only disabled because I got a conflicting trait impl error but then I still couldn't use split on a TCP stream)

@illegalprime illegalprime force-pushed the feat/tokio branch 2 times, most recently from 9aab73d to 7a64f25 Compare May 19, 2017 17:21
@illegalprime illegalprime merged commit 2253a0a into websockets-rs:master May 29, 2017
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