about summary refs log tree commit diff
path: root/src/libstd
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/libstd
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/libstd')
-rw-r--r--src/libstd/lib.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 03e90bf1089..8106d516dad 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -104,13 +104,14 @@
        html_root_url = "http://doc.rust-lang.org/",
        html_playground_url = "http://play.rust-lang.org/")]
 
-#![feature(macro_rules, globs, managed_boxes)]
-#![feature(linkage, default_type_params, phase, unsafe_destructor)]
+#![feature(macro_rules, globs, managed_boxes, linkage)]
+#![feature(default_type_params, phase, lang_items, unsafe_destructor)]
 
 // Don't link to std. We are std.
 #![no_std]
 
 #![allow(deprecated)]
+#![allow(unknown_features)] // NOTE: remove after stage0 snapshot
 #![deny(missing_doc)]
 
 // When testing libstd, bring in libuv as the I/O backend so tests can print