about summary refs log tree commit diff
path: root/src/libstd/std.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-10-06 14:41:28 -0700
committerbors <bors@rust-lang.org>2013-10-06 14:41:28 -0700
commit8eb28bb7dcd77ac9e804ab2d75b387ca3f47f9d4 (patch)
tree8843a8686ba71c57e01aa606c22db4c06bef327c /src/libstd/std.rs
parent4db6eba3a24778bd64260e5fcae24a41575c4d7b (diff)
parent3396365cab2da7bb1e9b57932f4092bfa49d3787 (diff)
downloadrust-8eb28bb7dcd77ac9e804ab2d75b387ca3f47f9d4.tar.gz
rust-8eb28bb7dcd77ac9e804ab2d75b387ca3f47f9d4.zip
auto merge of #9703 : alexcrichton/rust/compiler-features, r=cmr
This implements the necessary logic for gating particular features off by default in the compiler. There are a number of issues which have been wanting this form of mechanism, and this initially gates features which we have open issues for.

Additionally, this should unblock #9255
Diffstat (limited to 'src/libstd/std.rs')
-rw-r--r--src/libstd/std.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/std.rs b/src/libstd/std.rs
index 5501cdfdcd5..53837f96593 100644
--- a/src/libstd/std.rs
+++ b/src/libstd/std.rs
@@ -61,6 +61,8 @@ they contained the following prologue:
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
+#[feature(macro_rules, globs)];
+
 // Don't link to std. We are std.
 #[no_std];