---

yaml
---
r: 31220
b: refs/heads/dist-snap
c: 54cd5e1
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 3ef7ff8b892aa2ad7e821d8858c349e22d1197ba
+refs/heads/dist-snap: 54cd5e1814682e95360e591440274550ee312da4
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/compiletest/procsrv.rs

@@ -5,21 +5,21 @@ import libc::{c_int, pid_t};
 export run;
 
 #[cfg(target_os = "win32")]
-fn target_env(lib_path: str, prog: str) -> ~[(str,str)] {
+fn target_env(lib_path: ~str, prog: ~str) -> ~[(~str,~str)] {
 
     let mut env = os::env();
 
     // Make sure we include the aux directory in the path
-    assert prog.ends_with(".exe");
-    let aux_path = prog.slice(0u, prog.len() - 4u) + ".libaux";
+    assert prog.ends_with(~".exe");
+    let aux_path = prog.slice(0u, prog.len() - 4u) + ~".libaux";
 
     env = do vec::map(env) |pair| {
         let (k,v) = pair;
-        if k == "PATH" { ("PATH", v + ";" + lib_path + ";" + aux_path) }
+        if k == ~"PATH" { (~"PATH", v + ~";" + lib_path + ~";" + aux_path) }
         else { (k,v) }
     };
-    if str::ends_with(prog, "rustc.exe") {
-        vec::push(env, ("RUST_THREADS", "1"));
+    if str::ends_with(prog, ~"rustc.exe") {
+        vec::push(env, (~"RUST_THREADS", ~"1"));
     }
     ret env;
 }

branches/dist-snap/src/compiletest/runtest.rs

@@ -434,9 +434,9 @@ fn make_cmdline(_libpath: ~str, prog: ~str, args: ~[~str]) -> ~str {
 }
 
 #[cfg(target_os = "win32")]
-fn make_cmdline(libpath: str, prog: str, args: ~[str]) -> str {
+fn make_cmdline(libpath: ~str, prog: ~str, args: ~[~str]) -> ~str {
     #fmt["%s %s %s", lib_path_cmd_prefix(libpath), prog,
-         str::connect(args, " ")]
+         str::connect(args, ~" ")]
 }
 
 // Build the LD_LIBRARY_PATH variable as it would be seen on the command line

branches/dist-snap/src/compiletest/util.rs

@@ -31,7 +31,7 @@ fn lib_path_env_var() -> ~str { ~"PATH" }
 fn path_div() -> ~str { ~":" }
 
 #[cfg(target_os = "win32")]
-fn path_div() -> str { ~";" }
+fn path_div() -> ~str { ~";" }
 
 fn logv(config: config, s: ~str) {
     log(debug, s);