---

yaml
---
r: 23216
b: refs/heads/master
c: f7b35eb
h: refs/heads/master
v: v3

Author: brson

[refs]

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

trunk/src/rustdoc/config.rs

@@ -80,7 +80,7 @@ fn default_config(input_crate: ~str) -> config {
 type program_output = fn~((&str), (&[~str])) ->
     {status: int, out: ~str, err: ~str};
 
-fn mock_program_output(_prog: ~str, _args: ~[~str]) -> {
+fn mock_program_output(_prog: &str, _args: &[~str]) -> {
     status: int, out: ~str, err: ~str
 } {
     {
@@ -231,7 +231,7 @@ fn should_find_pandoc() {
         output_format: pandoc_html
         with default_config(~"test")
     };
-    let mock_program_output = fn~(_prog: ~str, _args: ~[~str]) -> {
+    let mock_program_output = fn~(_prog: &str, _args: &[~str]) -> {
         status: int, out: ~str, err: ~str
     } {
         {
@@ -248,7 +248,7 @@ fn should_error_with_no_pandoc() {
         output_format: pandoc_html
         with default_config(~"test")
     };
-    let mock_program_output = fn~(_prog: ~str, _args: ~[~str]) -> {
+    let mock_program_output = fn~(_prog: &str, _args: &[~str]) -> {
         status: int, out: ~str, err: ~str
     } {
         {