---

yaml
---
r: 29815
b: refs/heads/incoming
c: fe96716
h: refs/heads/master
i:
  29813: d7ac0d3
  29811: 387dee8
  29807: d45e389
v: v3

Author: graydon

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 138dc3048af36f0a20f857542c357fe8df563013
+refs/heads/incoming: fe96716a2ac951562994dfc81a845f7301bf1954
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustdoc/config.rs

@@ -77,7 +77,7 @@ fn default_config(input_crate: ~str) -> config {
     }
 }
 
-type program_output = fn~(~str, ~[~str]) ->
+type program_output = fn~((&str), (&[~str])) ->
     {status: int, out: ~str, err: ~str};
 
 fn mock_program_output(_prog: ~str, _args: ~[~str]) -> {

branches/incoming/src/rustdoc/markdown_writer.rs

@@ -97,7 +97,7 @@ fn pandoc_writer(
         let pipe_out = os::pipe();
         let pipe_err = os::pipe();
         let pid = run::spawn_process(
-            pandoc_cmd, pandoc_args, none, none,
+            pandoc_cmd, pandoc_args, &none, &none,
             pipe_in.in, pipe_out.out, pipe_err.out);
 
         let writer = io::fd_writer(pipe_in.out, false);