Stop using macro_escape as an inner attribute

In preparation for the rename.

12 files changed, 26 insertions, 18 deletions

diff --git a/src/libstd/bitflags.rs b/src/libstd/bitflags.rs
index 65cbce08543..ed3f2cbe1a1 100644
--- a/src/libstd/bitflags.rs
+++ b/src/libstd/bitflags.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![experimental]
-#![macro_escape]
 
 //! A typesafe bitmask flag generator.
 
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 3fa0b5645c5..bf373a145e4 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -282,10 +282,12 @@ pub mod net;
 pub mod pipe;
 pub mod process;
 pub mod stdio;
-pub mod test;
 pub mod timer;
 pub mod util;
 
+#[macro_escape]
+pub mod test;
+
 /// The default buffer size for various I/O operations
 // libuv recommends 64k buffers to maximize throughput
 // https://groups.google.com/forum/#!topic/libuv/oQO1HJAIDdA
diff --git a/src/libstd/io/test.rs b/src/libstd/io/test.rs
index 3ce56c907b3..6eeef175f73 100644
--- a/src/libstd/io/test.rs
+++ b/src/libstd/io/test.rs
@@ -10,8 +10,6 @@
 
 //! Various utility functions useful for writing I/O tests
 
-#![macro_escape]
-
 use prelude::v1::*;
 
 use libc;
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index eba90d39b4a..5ffd3ebc7ad 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -172,8 +172,15 @@ pub use unicode::char;
 
 /* Exported macros */
 
-#[cfg(stage0)] pub mod macros_stage0;
-#[cfg(not(stage0))] pub mod macros;
+#[cfg(stage0)]
+#[macro_escape]
+pub mod macros_stage0;
+
+#[cfg(not(stage0))]
+#[macro_escape]
+pub mod macros;
+
+#[macro_escape]
 pub mod bitflags;
 
 mod rtdeps;
@@ -185,9 +192,17 @@ pub mod prelude;
 
 /* Primitive types */
 
-#[path = "num/float_macros.rs"] mod float_macros;
-#[path = "num/int_macros.rs"]   mod int_macros;
-#[path = "num/uint_macros.rs"]  mod uint_macros;
+#[path = "num/float_macros.rs"]
+#[macro_escape]
+mod float_macros;
+
+#[path = "num/int_macros.rs"]
+#[macro_escape]
+mod int_macros;
+
+#[path = "num/uint_macros.rs"]
+#[macro_escape]
+mod uint_macros;
 
 #[path = "num/int.rs"]  pub mod int;
 #[path = "num/i8.rs"]   pub mod i8;
@@ -214,7 +229,9 @@ pub mod num;
 
 /* Runtime and platform support */
 
+#[macro_escape]
 pub mod thread_local;
+
 pub mod c_str;
 pub mod c_vec;
 pub mod dynamic_lib;
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index e833acb968d..6bf1ba2355f 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -15,7 +15,6 @@
 //! library.
 
 #![experimental]
-#![macro_escape]
 
 /// The entry point for panic of Rust tasks.
 ///
diff --git a/src/libstd/macros_stage0.rs b/src/libstd/macros_stage0.rs
index 63fd3209cc0..48d62e73e13 100644
--- a/src/libstd/macros_stage0.rs
+++ b/src/libstd/macros_stage0.rs
@@ -15,7 +15,6 @@
 //! library.
 
 #![experimental]
-#![macro_escape]
 
 /// The entry point for panic of Rust tasks.
 ///
diff --git a/src/libstd/num/float_macros.rs b/src/libstd/num/float_macros.rs
index fd00f15662a..4c52f29b12d 100644
--- a/src/libstd/num/float_macros.rs
+++ b/src/libstd/num/float_macros.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![experimental]
-#![macro_escape]
 #![doc(hidden)]
 
 macro_rules! assert_approx_eq {
diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs
index fce150c4ad1..ebcb2086187 100644
--- a/src/libstd/num/int_macros.rs
+++ b/src/libstd/num/int_macros.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![experimental]
-#![macro_escape]
 #![doc(hidden)]
 
 macro_rules! int_module { ($T:ty) => (
diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs
index 7818f4a0534..08ea1b024c9 100644
--- a/src/libstd/num/uint_macros.rs
+++ b/src/libstd/num/uint_macros.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![experimental]
-#![macro_escape]
 #![doc(hidden)]
 #![allow(unsigned_negation)]
 
diff --git a/src/libstd/rt/macros.rs b/src/libstd/rt/macros.rs
index 0f35500a04a..bbc96d0b19f 100644
--- a/src/libstd/rt/macros.rs
+++ b/src/libstd/rt/macros.rs
@@ -13,8 +13,6 @@
 //! These macros call functions which are only accessible in the `rt` module, so
 //! they aren't defined anywhere outside of the `rt` module.
 
-#![macro_escape]
-
 macro_rules! rterrln {
     ($fmt:expr $($arg:tt)*) => ( {
         ::rt::util::dumb_print(format_args!(concat!($fmt, "\n") $($arg)*))
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs
index d3b4fab9681..1ed01c034b5 100644
--- a/src/libstd/thread_local/mod.rs
+++ b/src/libstd/thread_local/mod.rs
@@ -34,13 +34,13 @@
 //! will want to make use of some form of **interior mutability** through the
 //! `Cell` or `RefCell` types.
 
-#![macro_escape]
 #![stable]
 
 use prelude::v1::*;
 
 use cell::UnsafeCell;
 
+#[macro_escape]
 pub mod scoped;
 
 // Sure wish we had macro hygiene, no?
diff --git a/src/libstd/thread_local/scoped.rs b/src/libstd/thread_local/scoped.rs
index dc36fda3a02..714b71d5dbd 100644
--- a/src/libstd/thread_local/scoped.rs
+++ b/src/libstd/thread_local/scoped.rs
@@ -38,7 +38,6 @@
 //! });
 //! ```
 
-#![macro_escape]
 #![unstable = "scoped TLS has yet to have wide enough use to fully consider \
                stabilizing its interface"]