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

Make stdbuild a cargo feature #764

Merged
merged 3 commits into from
Sep 12, 2017
Merged

Make stdbuild a cargo feature #764

merged 3 commits into from
Sep 12, 2017

Conversation

tamird
Copy link
Contributor

@tamird tamird commented Sep 12, 2017

Also invert the default feature / no std arrangement. The default
still uses std, but no_std now requires opt-in instead of opt-out.

This is work toward removing the shim in rustc.

Cargo.toml Outdated
@@ -18,8 +18,8 @@ travis-ci = { repository = "rust-lang/libc" }
appveyor = { repository = "rust-lang-libs/libc" }

[features]
default = ["use_std"]
Copy link
Member

Choose a reason for hiding this comment

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

This was intentionally set up like this before (enabling std as a feaeture), could this be reverted?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure. It's a bit more awkward because this setup allows stdbuild to depend on no_std, which can't be done in reverse, that's all.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@tamird
Copy link
Contributor Author

tamird commented Sep 12, 2017

This is green now, with the changes you requested.

Cargo.toml Outdated
@@ -20,6 +20,7 @@ appveyor = { repository = "rust-lang-libs/libc" }
[features]
default = ["use_std"]
use_std = []
stdbuild = []
Copy link
Member

Choose a reason for hiding this comment

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

Can this be avoided in this Cargo.toml? Ideally this isn't exported as part of the public API

@tamird
Copy link
Contributor Author

tamird commented Sep 12, 2017 via email

@alexcrichton
Copy link
Member

@bors: r+

AFAIK we have no path forward for using the libc crate as-is in rustbuild, we've got a long way to go to enable that.

@bors
Copy link
Contributor

bors commented Sep 12, 2017

📌 Commit 8a7069f has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Sep 12, 2017

⌛ Testing commit 8a7069f with merge 703ae4f...

bors added a commit that referenced this pull request Sep 12, 2017
Make stdbuild a cargo feature

Also invert the default feature / no std arrangement. The default
still uses std, but no_std now requires opt-in instead of opt-out.

This is work toward removing the shim in rustc.
@bors
Copy link
Contributor

bors commented Sep 12, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 703ae4f to master...

@bors bors merged commit 8a7069f into rust-lang:master Sep 12, 2017
@tamird tamird deleted the cargo-feature-stdbuild branch September 12, 2017 14:56
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 16, 2017
{compiler-builtins,libc} shim cleanup

~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Sep 16, 2017
{compiler-builtins,libc} shim cleanup

~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton
TimNN added a commit to TimNN/rust that referenced this pull request Sep 17, 2017
{compiler-builtins,libc} shim cleanup

~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton
TimNN added a commit to TimNN/rust that referenced this pull request Sep 17, 2017
{compiler-builtins,libc} shim cleanup

~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton
bors added a commit to rust-lang/rust that referenced this pull request Oct 7, 2017
{compiler-builtins,libc} shim cleanup

~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton
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.

3 participants