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

Hide Tokio crates behind cfg gate for Redox #317

Merged
merged 4 commits into from
Jun 20, 2017
Merged

Hide Tokio crates behind cfg gate for Redox #317

merged 4 commits into from
Jun 20, 2017

Conversation

hgoldstein
Copy link
Contributor

Closes #314.

I'm still trying to set up a redox environment (see: https://github.com/redox-os/redox/issues/970; I'm giving up trying to do this locally for now, spinning up Ubuntu VM) but in the meantime this should work.

@jackpot51
Copy link
Member

This looks good to me. Can you also change Cargo.toml ?

@@ -27,6 +27,8 @@ permutate = "0.3"
unicode-segmentation = "1.2"
smallvec = "0.4"
smallstring = "0.1"

[target.'cfg(not(target_os = "redox"))'.dependencies]
Copy link
Member

Choose a reason for hiding this comment

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

Should this also contain futures ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should and it does now.

@mmstick
Copy link
Contributor

mmstick commented Jun 20, 2017

Thanks! This should work for handling Redox.

@mmstick mmstick merged commit b1014bf into redox-os:master Jun 20, 2017
@hgoldstein hgoldstein deleted the redox_unbork branch June 20, 2017 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants