1 files changed, 16 insertions, 14 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 01effcadb3a..a0bb9449806 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -213,13 +213,12 @@
        test(no_crate_inject, attr(deny(warnings))),
        test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))]
 
-// SNAP 1af31d4
-#![allow(unused_features)]
-// SNAP 1af31d4
-#![allow(unused_attributes)]
+#![cfg_attr(stage0, allow(unused_attributes))]
+#![cfg_attr(stage0, allow(improper_ctypes))]
 
 #![feature(alloc)]
 #![feature(allow_internal_unstable)]
+#![feature(asm)]
 #![feature(associated_consts)]
 #![feature(borrow_state)]
 #![feature(box_syntax)]
@@ -233,49 +232,52 @@
 #![feature(core_float)]
 #![feature(core_intrinsics)]
 #![feature(core_simd)]
+#![feature(decode_utf16)]
 #![feature(drain)]
+#![feature(drop_in_place)]
+#![feature(dropck_parametricity)]
+#![feature(float_extras)]
+#![feature(float_from_str_radix)]
 #![feature(fnbox)]
 #![feature(heap_api)]
 #![feature(int_error_internals)]
 #![feature(into_cow)]
 #![feature(lang_items)]
 #![feature(libc)]
-#![feature(linkage, thread_local, asm)]
+#![feature(link_args)]
+#![feature(linkage)]
 #![feature(macro_reexport)]
-#![feature(slice_concat_ext)]
 #![feature(no_std)]
 #![feature(oom)]
 #![feature(optin_builtin_traits)]
 #![feature(placement_in_syntax)]
 #![feature(rand)]
+#![feature(range_inclusive)]
 #![feature(raw)]
 #![feature(reflect_marker)]
 #![feature(slice_bytes)]
+#![feature(slice_concat_ext)]
 #![feature(slice_patterns)]
 #![feature(staged_api)]
 #![feature(str_char)]
 #![feature(str_internals)]
+#![feature(str_utf16)]
+#![feature(test, rustc_private)]
+#![feature(thread_local)]
 #![feature(unboxed_closures)]
 #![feature(unicode)]
 #![feature(unique)]
-#![feature(dropck_parametricity)]
 #![feature(unsafe_no_drop_flag, filling_drop)]
-#![feature(decode_utf16)]
 #![feature(unwind_attributes)]
 #![feature(vec_push_all)]
 #![feature(wrapping)]
 #![feature(zero_one)]
-#![feature(drop_in_place)]
-
-#![cfg_attr(windows, feature(str_utf16))]
-#![cfg_attr(test, feature(float_from_str_radix, range_inclusive, float_extras))]
-#![cfg_attr(test, feature(test, rustc_private))]
-#![cfg_attr(target_env = "msvc", feature(link_args))]
 
 // Don't link to std. We are std.
 #![no_std]
 
 #![deny(missing_docs)]
+#![allow(unused_features)] // std may use features in a platform-specific way
 
 #[cfg(test)] extern crate test;
 #[cfg(test)] #[macro_use] extern crate log;