summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-06-28 04:03:20 +0000
committerbors <bors@rust-lang.org>2018-06-28 04:03:20 +0000
commit7cac8d0c9db3eff1d8c0d0e21f4a27bedb3c0ad5 (patch)
tree9982619da34340c669086aa2be968604f52b38f3
parent0d0a5f75107a9c4236664a1f04b41d5bc00f3406 (diff)
parentf164aa8806598b0a79e56c691dc9833d75622cf4 (diff)
downloadrust-libc-7cac8d0c9db3eff1d8c0d0e21f4a27bedb3c0ad5.tar.gz
Auto merge of #1019 - est31:master, r=alexcrichton
Simplify the stdbuild section Found this when encountering the code in the rustc submodule and changing the allow for the warnings to deny. * `no_std` is stable so it does not have to be listed in the `feature` attribute * `no_std` as an attribute for the crate is already implied by the `#![cfg_attr(not(feature = "use_std"), no_std)]` below * `staged_api` as an attribute gives a warning. That also matches my knowledge.
-rw-r--r--src/lib.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 489315cfda..f7efb6002e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -86,10 +86,8 @@
))]
// Attributes needed when building as part of the standard library
-#![cfg_attr(feature = "stdbuild", feature(no_std, staged_api, custom_attribute, cfg_target_vendor))]
+#![cfg_attr(feature = "stdbuild", feature(staged_api, custom_attribute, cfg_target_vendor))]
#![cfg_attr(feature = "stdbuild", feature(link_cfg, repr_packed))]
-#![cfg_attr(feature = "stdbuild", no_std)]
-#![cfg_attr(feature = "stdbuild", staged_api)]
#![cfg_attr(feature = "stdbuild", allow(warnings))]
#![cfg_attr(feature = "stdbuild", unstable(feature = "libc",
reason = "use `libc` from crates.io",