Skip to content

Commit 7ea4245

Browse files
committed
---
yaml --- r: 147450 b: refs/heads/try2 c: dd19785 h: refs/heads/master v: v3
1 parent 1c79b79 commit 7ea4245

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4538369566b8b51fc8371253aa90f9725547a193
8+
refs/heads/try2: dd19785f963fd1045e53447add17ab36ca41fc79
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/io/stdio.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,17 @@ fn with_task_stdout(f: |&mut Writer|) {
132132
}
133133

134134
None => {
135-
let mut io = stdout();
135+
struct Stdout;
136+
impl Writer for Stdout {
137+
fn write(&mut self, data: &[u8]) {
138+
unsafe {
139+
libc::write(libc::STDOUT_FILENO,
140+
vec::raw::to_ptr(data) as *libc::c_void,
141+
data.len() as libc::size_t);
142+
}
143+
}
144+
}
145+
let mut io = Stdout;
136146
f(&mut io as &mut Writer);
137147
}
138148
}

branches/try2/src/libstd/rt/util.rs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,22 @@ pub fn default_sched_threads() -> uint {
6868
}
6969

7070
pub fn dumb_println(args: &fmt::Arguments) {
71-
use io::native::file::FileDesc;
7271
use io;
7372
use libc;
74-
let mut out = FileDesc::new(libc::STDERR_FILENO, false);
75-
fmt::writeln(&mut out as &mut io::Writer, args);
73+
use vec;
74+
75+
struct Stderr;
76+
impl io::Writer for Stderr {
77+
fn write(&mut self, data: &[u8]) {
78+
unsafe {
79+
libc::write(libc::STDERR_FILENO,
80+
vec::raw::to_ptr(data) as *libc::c_void,
81+
data.len() as libc::size_t);
82+
}
83+
}
84+
}
85+
let mut w = Stderr;
86+
fmt::writeln(&mut w as &mut io::Writer, args);
7687
}
7788

7889
pub fn abort(msg: &str) -> ! {

0 commit comments

Comments
 (0)