---

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

Author: brson

[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: fe96716a2ac951562994dfc81a845f7301bf1954
+refs/heads/incoming: f7b35ebd351f03193006a43ddf8178dcb19b776b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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
     } {
         {