diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 19:01:17 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-05 19:01:17 -0800 |
| commit | 7975fd9cee750f26f9f6ef85b92a20b24ee24120 (patch) | |
| tree | 0c36840cd8bf89ad1f662ed81d8e71c93e22c41e /src/libstd/rt | |
| parent | 563f6d8218cf15bf2590507c38ce4cbb734d6bba (diff) | |
| parent | 78e841d8b10e05b5bbad4b02a9d5f0e9611100c7 (diff) | |
| download | rust-7975fd9cee750f26f9f6ef85b92a20b24ee24120.tar.gz rust-7975fd9cee750f26f9f6ef85b92a20b24ee24120.zip | |
rollup merge of #20482: kmcallister/macro-reform
Conflicts: src/libflate/lib.rs src/libstd/lib.rs src/libstd/macros.rs src/libsyntax/feature_gate.rs src/libsyntax/parse/parser.rs src/libsyntax/show_span.rs src/test/auxiliary/macro_crate_test.rs src/test/compile-fail/lint-stability.rs src/test/run-pass/intrinsics-math.rs src/test/run-pass/tcp-connect-timeouts.rs
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/macros.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
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/rt/mod.rs b/src/libstd/rt/mod.rs index 2b0639c5705..e556888a470 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -39,6 +39,8 @@ pub use alloc::heap; pub mod backtrace; // Internals +#[cfg_attr(stage0, macro_escape)] +#[cfg_attr(not(stage0), macro_use)] mod macros; // These should be refactored/moved/made private over time |