about summary refs log tree commit diff
path: root/src/libstd/thread_local
diff options
context:
space:
mode:
authorKeegan McAllister <kmcallister@mozilla.com>2014-12-18 20:48:26 -0800
committerKeegan McAllister <kmcallister@mozilla.com>2015-01-05 12:00:57 -0800
commit5bf385be6a5ce267ac7cd9d1725178488e33131c (patch)
tree7cfa66cf0c1acd0e6cf29efe0d77deb29d3a8946 /src/libstd/thread_local
parentfc584793237c388e9dca76ef406d1af34e453fe2 (diff)
downloadrust-5bf385be6a5ce267ac7cd9d1725178488e33131c.tar.gz
rust-5bf385be6a5ce267ac7cd9d1725178488e33131c.zip
Rename macro_escape to macro_use
In the future we want to support

    #[macro_use(foo, bar)]
    mod macros;

but it's not an essential part of macro reform.  Reserve the syntax for now.
Diffstat (limited to 'src/libstd/thread_local')
-rw-r--r--src/libstd/thread_local/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs
index 1ed01c034b5..e0cbaa8ca50 100644
--- a/src/libstd/thread_local/mod.rs
+++ b/src/libstd/thread_local/mod.rs
@@ -40,7 +40,8 @@ use prelude::v1::*;
 
 use cell::UnsafeCell;
 
-#[macro_escape]
+#[cfg_attr(stage0, macro_escape)]
+#[cfg_attr(not(stage0), macro_use)]
 pub mod scoped;
 
 // Sure wish we had macro hygiene, no?