From 36cf65c27cf36d9361d6cc851da9c2b5c12d0ce3 Mon Sep 17 00:00:00 2001 From: Jonathan Reem Date: Fri, 8 Aug 2014 15:09:12 -0700 Subject: [PATCH] Remove dumb_println After #10965, which introduces no-context printing, this is no longer needed. Fixes #11043 --- src/libgreen/macros.rs | 11 ++--------- src/librustuv/macros.rs | 10 ++-------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/libgreen/macros.rs b/src/libgreen/macros.rs index 4cce430d88a8d..37bb3239296e8 100644 --- a/src/libgreen/macros.rs +++ b/src/libgreen/macros.rs @@ -13,15 +13,14 @@ #![macro_escape] -use std::fmt; - // Indicates whether we should perform expensive sanity checks, including rtassert! // FIXME: Once the runtime matures remove the `true` below to turn off rtassert, etc. pub static ENFORCE_SANITY: bool = true || !cfg!(rtopt) || cfg!(rtdebug) || cfg!(rtassert); macro_rules! rterrln ( ($($arg:tt)*) => ( { - format_args!(::macros::dumb_println, $($arg)*) + use std::io::stdio; + format_args!(stdio::println_args, $($arg)*) } ) ) @@ -51,12 +50,6 @@ macro_rules! rtabort ( } ) ) -pub fn dumb_println(args: &fmt::Arguments) { - use std::rt; - let mut w = rt::Stderr; - let _ = writeln!(&mut w, "{}", args); -} - pub fn abort(msg: &str) -> ! { let msg = if !msg.is_empty() { msg } else { "aborted" }; let hash = msg.chars().fold(0, |accum, val| accum + (val as uint) ); diff --git a/src/librustuv/macros.rs b/src/librustuv/macros.rs index deb7036848f96..d41aa1309ece9 100644 --- a/src/librustuv/macros.rs +++ b/src/librustuv/macros.rs @@ -10,11 +10,10 @@ #![macro_escape] -use std::fmt; - macro_rules! uverrln ( ($($arg:tt)*) => ( { - format_args!(::macros::dumb_println, $($arg)*) + use std::io::stdio; + format_args!(stdio::println_args, $($arg)*) } ) ) @@ -27,8 +26,3 @@ macro_rules! uvdebug ( }) ) -pub fn dumb_println(args: &fmt::Arguments) { - use std::rt; - let mut w = rt::Stderr; - let _ = writeln!(&mut w, "{}", args); -}