---

yaml
---
r: 23215
b: refs/heads/master
c: fe96716
h: refs/heads/master
i:
  23213: 6937cda
  23211: 5aff157
  23207: 2fae76c
  23199: 6b198a0
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 138dc3048af36f0a20f857542c357fe8df563013
+refs/heads/master: fe96716a2ac951562994dfc81a845f7301bf1954
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/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]) -> {

trunk/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);