Skip to content

Commit 115e1a5

Browse files
committed
---
yaml --- r: 41439 b: refs/heads/snap-stage3 c: b80d711 h: refs/heads/master i: 41437: 5041023 41435: 5c03417 41431: a12eb3d 41423: 41549be 41407: d5c6340 v: v3
1 parent 68f22bb commit 115e1a5

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 65f711a617e1cd3676cc6f3dbc40b26ecfcfed7b
4+
refs/heads/snap-stage3: b80d711912412fced8a09c66e864557394296863
55
refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustdoc/markdown_writer.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use core::result;
2626
use core::run;
2727
use core::str;
2828
use core::task;
29+
use core::pipes::*;
2930
use std::future;
3031
use syntax;
3132

@@ -168,12 +169,8 @@ fn readclose(fd: libc::c_int) -> ~str {
168169
}
169170
170171
fn generic_writer(process: fn~(markdown: ~str)) -> Writer {
171-
let (setup_po, setup_ch) = pipes::stream();
172+
let (po, ch) = stream::<WriteInstr>();
172173
do task::spawn |move process, move setup_ch| {
173-
let po: oldcomm::Port<WriteInstr> = oldcomm::Port();
174-
let ch = oldcomm::Chan(&po);
175-
setup_ch.send(ch);
176-
177174
let mut markdown = ~"";
178175
let mut keep_going = true;
179176
while keep_going {
@@ -184,10 +181,8 @@ fn generic_writer(process: fn~(markdown: ~str)) -> Writer {
184181
}
185182
process(move markdown);
186183
};
187-
let ch = setup_po.recv();
188-
189184
fn~(instr: WriteInstr) {
190-
oldcomm::send(ch, instr);
185+
ch.send(instr);
191186
}
192187
}
193188

0 commit comments

Comments
 (0)