about summary refs log tree commit diff
path: root/src/liballoc_system
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-12-21 21:37:26 +0000
committerbors <bors@rust-lang.org>2015-12-21 21:37:26 +0000
commit2343a92a908901958c8207d6d0430a2e59ab0a9c (patch)
treed94ff32886bfd66272eeb64ecf3672169be9372e /src/liballoc_system
parent709d00a2317002183b81df26e9b0b546483ba6f7 (diff)
parentcd1848a1a60f40f25019e455b1050efd69707604 (diff)
downloadrust-2343a92a908901958c8207d6d0430a2e59ab0a9c.tar.gz
rust-2343a92a908901958c8207d6d0430a2e59ab0a9c.zip
Auto merge of #30352 - alexcrichton:new-snashots, r=nikomatsakis
Lots of cruft to remove!
Diffstat (limited to 'src/liballoc_system')
-rw-r--r--src/liballoc_system/lib.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs
index a6e89d5d00c..fccc024603e 100644
--- a/src/liballoc_system/lib.rs
+++ b/src/liballoc_system/lib.rs
@@ -8,13 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![cfg_attr(stage0, feature(custom_attribute))]
 #![crate_name = "alloc_system"]
 #![crate_type = "rlib"]
-#![cfg_attr(stage0, staged_api)]
 #![no_std]
-#![cfg_attr(not(stage0), allocator)]
-#![cfg_attr(stage0, allow(improper_ctypes))]
+#![allocator]
 #![unstable(feature = "alloc_system",
             reason = "this library is unlikely to be stabilized in its current \
                       form or name",
@@ -22,7 +19,6 @@
 #![feature(allocator)]
 #![feature(libc)]
 #![feature(staged_api)]
-#![cfg_attr(stage0, feature(no_std))]
 
 extern crate libc;