Skip to content

Commit 57c557f

Browse files
committed
---
yaml --- r: 34798 b: refs/heads/master c: 6ce4cf7 h: refs/heads/master v: v3
1 parent 7a9faa2 commit 57c557f

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: c0cee3ebe47d4fca73cdab23889322c5e47f12e5
2+
refs/heads/master: 6ce4cf769f671c53f05e97357110d4c0ba322eae
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/rustdoc/markdown_writer.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,15 @@ fn readclose(fd: libc::c_int) -> ~str {
136136
// Copied from run::program_output
137137
let file = os::fdopen(fd);
138138
let reader = io::FILE_reader(file, false);
139-
let mut buf = ~"";
140-
while !reader.eof() {
141-
let bytes = reader.read_bytes(4096u);
142-
buf += str::from_bytes(bytes);
143-
}
139+
let buf = io::with_bytes_writer(|writer| {
140+
let mut bytes = [mut 0, ..4096];
141+
while !reader.eof() {
142+
let nread = reader.read(bytes, bytes.len());
143+
writer.write(bytes.view(0, nread));
144+
}
145+
});
144146
os::fclose(file);
145-
return buf;
147+
str::from_bytes(buf)
146148
}
147149
148150
fn generic_writer(+process: fn~(markdown: ~str)) -> Writer {

0 commit comments

Comments
 (0)