about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-24 07:56:51 +0000
committerbors <bors@rust-lang.org>2014-06-24 07:56:51 +0000
commitd9611da4e652ab9428a864368c99d6e9ed3d72df (patch)
tree4f72359dc016a4df4c70aea0d208453f888c2b42 /src/liballoc
parente8c12d32a2e989d02d26a80f91d2c49a8bc1aaad (diff)
parent5466d13d4320252f57d276c566dbee44617b63b2 (diff)
downloadrust-d9611da4e652ab9428a864368c99d6e9ed3d72df.tar.gz
rust-d9611da4e652ab9428a864368c99d6e9ed3d72df.zip
auto merge of #15066 : pcwalton/rust/lang-and-intrinsic-feature-gate, r=alexcrichton
If you define lang items in your crate, add `#[feature(lang_items)]`.

If you define intrinsics (`extern "rust-intrinsic"`), add
`#[feature(intrinsics)]`.

Closes #12858.

[breaking-change]

r? @brson
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 5368c1d0dc5..e89a9c019bb 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -69,7 +69,8 @@
        html_root_url = "http://doc.rust-lang.org/")]
 
 #![no_std]
-#![feature(phase, unsafe_destructor)]
+#![feature(lang_items, phase, unsafe_destructor)]
+#![allow(unknown_features)] // NOTE: remove after a stage0 snap
 
 #[phase(plugin, link)]
 extern crate core;