diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/alloc.rs | 3 | ||||
| -rw-r--r-- | src/libstd/macros.rs | 14 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index 8db365cd21d..b9aba1e9cab 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -125,8 +125,7 @@ fn default_alloc_error_hook(layout: Layout) { #[cfg(not(test))] #[doc(hidden)] -#[cfg_attr(stage0, lang = "oom")] -#[cfg_attr(not(stage0), alloc_error_handler)] +#[alloc_error_handler] #[unstable(feature = "alloc_internals", issue = "0")] pub fn rust_oom(layout: Layout) -> ! { let hook = HOOK.load(Ordering::SeqCst); diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 0025f21da22..a96e2ba2134 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -157,12 +157,7 @@ macro_rules! print { macro_rules! println { () => (print!("\n")); ($($arg:tt)*) => ({ - #[cfg(not(stage0))] { - ($crate::io::_print(format_args_nl!($($arg)*))); - } - #[cfg(stage0)] { - print!("{}\n", format_args!($($arg)*)) - } + $crate::io::_print(format_args_nl!($($arg)*)); }) } @@ -221,12 +216,7 @@ macro_rules! eprint { macro_rules! eprintln { () => (eprint!("\n")); ($($arg:tt)*) => ({ - #[cfg(all(not(stage0), not(stage1)))] { - ($crate::io::_eprint(format_args_nl!($($arg)*))); - } - #[cfg(any(stage0, stage1))] { - eprint!("{}\n", format_args!($($arg)*)) - } + $crate::io::_eprint(format_args_nl!($($arg)*)); }) } |