---

graydon · graydon · commit 1a580624e73f · 2012-08-14T14:27:46.000-07:00
yaml --- r: 21107 b: refs/heads/snap-stage3 c: fe96716 h: refs/heads/master i: 21105: 5e538df 21103: 8f003b8 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 138dc3048af36f0a20f857542c357fe8df563013
+refs/heads/snap-stage3: fe96716a2ac951562994dfc81a845f7301bf1954
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/rustdoc/config.rs b/branches/snap-stage3/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]) -> {
diff --git a/branches/snap-stage3/src/rustdoc/markdown_writer.rs b/branches/snap-stage3/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);

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ fn default_config(input_crate: ~str) -> config {`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`-type program_output = fn~(~str, ~[~str]) ->`
	`80`	`+type program_output = fn~((&str), (&[~str])) ->`
`81`	`81`	`{status: int, out: ~str, err: ~str};`
`82`	`82`
`83`	`83`	`fn mock_program_output(_prog: ~str, _args: ~[~str]) -> {`