Skip to content

Commit fa43a25

Browse files
committed
---
yaml --- r: 35991 b: refs/heads/try2 c: 6ce4cf7 h: refs/heads/master i: 35989: b1f7e83 35987: 9077b44 35983: 45ecab5 v: v3
1 parent 1ee5b8d commit fa43a25

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: c0cee3ebe47d4fca73cdab23889322c5e47f12e5
8+
refs/heads/try2: 6ce4cf769f671c53f05e97357110d4c0ba322eae
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/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)