Bugs?

diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs
index 80fe812c8bd902822c1039463e560927ae67ab86..2e840da0d8cec03ae2467c286c8ef2f1714d5909 100644 (file)
--- a/src/cargo/util/mod.rs
+++ b/src/cargo/util/mod.rs
@@ -1 +1,6 @@
-pub mod process;
+//pub use self::process_builder::process;
+//mod process_builder;
+
+pub fn process(cmd: &str) -> &'static str {
+  "ohai"
+}

diff --git a/src/cargo/util/process.rs b/src/cargo/util/process.rs
deleted file mode 100644 (file)
index c62907e..0000000
--- a/src/cargo/util/process.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use std::os;
-use std::io::process::{Process,ProcessConfig,InheritFd};
-
-pub struct ProcessBuilder {
-  program: ~str,
-  args: ~[~str],
-  path: ~[~str]
-}
-
-impl ProcessBuilder {
-  fn args(mut self, arguments: &[~str]) -> ProcessBuilder {
-    self.args = arguments.clone();
-    self
-  }
-}
-
-pub fn process(cmd: &str) -> ProcessBuilder {
-  ProcessBuilder { program: cmd.to_owned(), args: ~[], path: get_curr_path() }
-}
-
-fn get_curr_path() -> ~[~str] {
-  os::getenv("PATH").map(|path| {
-    path.split(std::path::SEP).collect()
-  }).or(~[])
-}

diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs
new file mode 100644 (file)
index 0000000..b05359d
--- /dev/null
+++ b/src/cargo/util/process_builder.rs
@@ -0,0 +1,26 @@
+use std;
+use std::os;
+use std::io::process::{Process,ProcessConfig,InheritFd};
+
+pub struct ProcessBuilder {
+  program: ~str,
+  args: ~[~str],
+  path: ~[~str]
+}
+
+impl ProcessBuilder {
+  fn args(mut self, arguments: &[~str]) -> ProcessBuilder {
+    self.args = arguments.to_owned();
+    self
+  }
+}
+
+pub fn process(cmd: &str) -> ProcessBuilder {
+  ProcessBuilder { program: cmd.to_owned(), args: ~[], path: get_curr_path() }
+}
+
+fn get_curr_path() -> ~[~str] {
+  os::getenv("PATH").map(|path| {
+    path.split(std::path::SEP).map(|seg| seg.to_owned()).collect()
+  }).unwrap_or(~[])
+}