about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-04 06:07:02 -0700
committerbors <bors@rust-lang.org>2014-04-04 06:07:02 -0700
commit286b62e0da509888fb6cc05b5b174cb4353e6fd5 (patch)
tree4891c54aa8138b3caf26d66b29dbf83480e1aeee /src/libstd/lib.rs
parent37a9885429e8d76baad64877959400a81a2b4528 (diff)
parent6c5e1d092573a8c3085ac04a10572685b229a680 (diff)
downloadrust-286b62e0da509888fb6cc05b5b174cb4353e6fd5.tar.gz
rust-286b62e0da509888fb6cc05b5b174cb4353e6fd5.zip
auto merge of #13295 : huonw/rust/gate-concat-idents, r=alexcrichton
rustc: feature-gate `concat_idents!`.

concat_idents! is not as useful as it could be, due to macros only being
allowed in limited places, and hygiene, so lets feature gate it until we
make a decision about it.

cc #13294
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 5177bc08890..f4f5be4d37a 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -52,7 +52,7 @@
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://static.rust-lang.org/doc/master")]
 #![feature(macro_rules, globs, asm, managed_boxes, thread_local, link_args,
-           simd, linkage, default_type_params, phase)]
+           simd, linkage, default_type_params, phase, concat_idents)]
 
 // Don't link to std. We are std.
 #![no_std]
@@ -60,6 +60,7 @@
 // #![deny(missing_doc)] // NOTE: uncomment after a stage0 snap
 #![allow(missing_doc)] // NOTE: remove after a stage0 snap
 #![allow(visible_private_types)] // NOTE: remove after a stage0 snap
+#![allow(unknown_features)] // NOTE: remove after a stage0 snap
 
 // When testing libstd, bring in libuv as the I/O backend so tests can print
 // things and all of the std::io tests have an I/O interface to run on top