---

yaml
---
r: 29819
b: refs/heads/incoming
c: b756c36
h: refs/heads/master
i:
  29817: fca85d1
  29815: f50c090
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: 589ee65fd4ea311beeb42ebdc5e6a4b6960bd303
+refs/heads/incoming: b756c36b5291c40259ed0771fc898db84d6fd49b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/compiletest/procsrv.rs

@@ -45,8 +45,8 @@ fn run(lib_path: ~str,
     let pipe_out = os::pipe();
     let pipe_err = os::pipe();
     let pid = spawn_process(prog, args,
-                            some(env + target_env(lib_path, prog)),
-                            none, pipe_in.in, pipe_out.out, pipe_err.out);
+                            &some(env + target_env(lib_path, prog)),
+                            &none, pipe_in.in, pipe_out.out, pipe_err.out);
 
     os::close(pipe_in.in);
     os::close(pipe_out.out);