---

yaml
---
r: 11674
b: refs/heads/master
c: 513d956
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: dc0b9f44e2731dec413d69997ad093962deb665e
+refs/heads/master: 513d956dce5be849b69d1b3b4b7aa5c0252fcc1f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/markdown_writer.rs

@@ -101,12 +101,19 @@ fn pandoc_writer(
         os::close(pipe_err.out);
         os::close(pipe_in.out);
 
-        let stdout = result::get(task::try {||
-            readclose(pipe_out.in)
-        });
-        let stderr = result::get(task::try {||
-            readclose(pipe_err.in)
-        });
+        let stdout_po = comm::port();
+        let stdout_ch = comm::chan(stdout_po);
+        task::spawn_sched(task::single_threaded) {||
+            comm::send(stdout_ch, readclose(pipe_out.in));
+        }
+        let stdout = comm::recv(stdout_po);
+
+        let stderr_po = comm::port();
+        let stderr_ch = comm::chan(stderr_po);
+        task::spawn_sched(task::single_threaded) {||
+            comm::send(stderr_ch, readclose(pipe_err.in));
+        }
+        let stderr = comm::recv(stderr_po);
 
         let status = run::waitpid(pid);
         #debug("pandoc result: %i", status);