about summary refs log tree commit diff
path: root/src/lib/run_program.rs
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2011-05-16 18:21:22 -0700
committerGraydon Hoare <graydon@mozilla.com>2011-05-16 18:21:22 -0700
commitfbbc1a77d242fafa1393127defa7ffec0bcb9e54 (patch)
treeec83e08cb3fb8c95c24b7566ba8ab0904ced9aae /src/lib/run_program.rs
parentae030c5bf277e90b9aeea7e301fd3001f3a66b8d (diff)
downloadrust-fbbc1a77d242fafa1393127defa7ffec0bcb9e54.tar.gz
rust-fbbc1a77d242fafa1393127defa7ffec0bcb9e54.zip
Rewrite everything to use [] instead of vec() in value position.
Diffstat (limited to 'src/lib/run_program.rs')
-rw-r--r--src/lib/run_program.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/run_program.rs b/src/lib/run_program.rs
index abcf1472067..06fe23596c0 100644
--- a/src/lib/run_program.rs
+++ b/src/lib/run_program.rs
@@ -5,8 +5,8 @@ native "rust" mod rustrt {
     fn rust_run_program(vbuf argv, int in_fd, int out_fd, int err_fd) -> int;
 }
 
-fn argvec(str prog, vec[str] args) -> vec[sbuf] {
-    auto argptrs = vec(_str::buf(prog));
+fn arg_vec(str prog, vec[str] args) -> vec[sbuf] {
+    auto argptrs = [_str::buf(prog)];
     for (str arg in args) {
         _vec::push[sbuf](argptrs, _str::buf(arg));
     }
@@ -15,7 +15,7 @@ fn argvec(str prog, vec[str] args) -> vec[sbuf] {
 }
 
 fn run_program(str prog, vec[str] args) -> int {
-    auto pid = rustrt::rust_run_program(_vec::buf[sbuf](argvec(prog, args)),
+    auto pid = rustrt::rust_run_program(_vec::buf[sbuf](arg_vec(prog, args)),
                                        0, 0, 0);
     ret os::waitpid(pid);
 }
@@ -33,7 +33,7 @@ fn start_program(str prog, vec[str] args) -> @program {
     auto pipe_input = os::pipe();
     auto pipe_output = os::pipe();
     auto pid = rustrt::rust_run_program
-        (_vec::buf[sbuf](argvec(prog, args)),
+        (_vec::buf[sbuf](arg_vec(prog, args)),
          pipe_input._0, pipe_output._1, 0);
     if (pid == -1) {fail;}
     os::libc::close(pipe_input._0);
@@ -92,5 +92,5 @@ fn program_output(str prog, vec[str] args)
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C .. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End: