Skip to content

Commit 36cf65c

Browse files
committed
Remove dumb_println
After rust-lang#10965, which introduces no-context printing, this is no longer needed. Fixes rust-lang#11043
1 parent 87d2bf4 commit 36cf65c

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

src/libgreen/macros.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313

1414
#![macro_escape]
1515

16-
use std::fmt;
17-
1816
// Indicates whether we should perform expensive sanity checks, including rtassert!
1917
// FIXME: Once the runtime matures remove the `true` below to turn off rtassert, etc.
2018
pub static ENFORCE_SANITY: bool = true || !cfg!(rtopt) || cfg!(rtdebug) || cfg!(rtassert);
2119

2220
macro_rules! rterrln (
2321
($($arg:tt)*) => ( {
24-
format_args!(::macros::dumb_println, $($arg)*)
22+
use std::io::stdio;
23+
format_args!(stdio::println_args, $($arg)*)
2524
} )
2625
)
2726

@@ -51,12 +50,6 @@ macro_rules! rtabort (
5150
} )
5251
)
5352

54-
pub fn dumb_println(args: &fmt::Arguments) {
55-
use std::rt;
56-
let mut w = rt::Stderr;
57-
let _ = writeln!(&mut w, "{}", args);
58-
}
59-
6053
pub fn abort(msg: &str) -> ! {
6154
let msg = if !msg.is_empty() { msg } else { "aborted" };
6255
let hash = msg.chars().fold(0, |accum, val| accum + (val as uint) );

src/librustuv/macros.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010

1111
#![macro_escape]
1212

13-
use std::fmt;
14-
1513
macro_rules! uverrln (
1614
($($arg:tt)*) => ( {
17-
format_args!(::macros::dumb_println, $($arg)*)
15+
use std::io::stdio;
16+
format_args!(stdio::println_args, $($arg)*)
1817
} )
1918
)
2019

@@ -27,8 +26,3 @@ macro_rules! uvdebug (
2726
})
2827
)
2928

30-
pub fn dumb_println(args: &fmt::Arguments) {
31-
use std::rt;
32-
let mut w = rt::Stderr;
33-
let _ = writeln!(&mut w, "{}", args);
34-
}

0 commit comments

Comments
 (0)