about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-06 09:24:46 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-06 15:24:24 -0800
commite2f97f51ad4cf902e5a5835b5332447fe59089c4 (patch)
tree6158174fbd2ae40d72c113d398ff192a936804f7 /src/libstd/rt
parent5c3ddcb15dc8b40fa780a38fd7494b9b5b991d09 (diff)
downloadrust-e2f97f51ad4cf902e5a5835b5332447fe59089c4.tar.gz
rust-e2f97f51ad4cf902e5a5835b5332447fe59089c4.zip
Register new snapshots
Conflicts:
	src/librbml/lib.rs
	src/libserialize/json_stage0.rs
	src/libserialize/serialize_stage0.rs
	src/libsyntax/ast.rs
	src/libsyntax/ext/deriving/generic/mod.rs
	src/libsyntax/parse/token.rs
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/mod.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index e556888a470..2d54fc36ca8 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -39,8 +39,7 @@ pub use alloc::heap;
 pub mod backtrace;
 
 // Internals
-#[cfg_attr(stage0, macro_escape)]
-#[cfg_attr(not(stage0), macro_use)]
+#[macro_use]
 mod macros;
 
 // These should be refactored/moved/made private over time