---

yaml
---
r: 63807
b: refs/heads/snap-stage3
c: 9b95b6d
h: refs/heads/master
i:
  63805: 28d8005
  63803: c099ba0
  63799: 35e9239
  63791: 8eafa13
  63775: 27622dd
  63743: f90462d
v: v3

Author: yichoi

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 887ae82382ff4fad401a6539356245d2a05d6b4f
+refs/heads/snap-stage3: 9b95b6d210a6491396311c83f0d12dfb4962d678
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustpkg/path_util.rs

@@ -22,40 +22,11 @@ use core::iterator::IteratorUtil;
 use messages::*;
 use package_id::*;
 
-fn push_if_exists(vec: &mut ~[Path], p: &Path) {
-    let maybe_dir = p.push(".rust");
-    if os::path_exists(&maybe_dir) {
-        vec.push(maybe_dir);
-    }
-}
-
-#[cfg(windows)]
-static path_entry_separator: &'static str = ";";
-#[cfg(not(windows))]
-static path_entry_separator: &'static str = ":";
-
 /// Returns the value of RUST_PATH, as a list
-/// of Paths. Includes default entries for, if they exist:
-/// $HOME/.rust
-/// DIR/.rust for any DIR that's the current working directory
-/// or an ancestor of it
+/// of Paths. In general this should be read from the
+/// environment; for now, it's hard-wired to just be "."
 pub fn rust_path() -> ~[Path] {
-    let env_path: ~str = os::getenv("RUST_PATH").get_or_default(~"");
-    let mut env_rust_path: ~[Path] = match os::getenv("RUST_PATH") {
-        Some(env_path) => {
-            let env_path_components: ~[&str] =
-                env_path.split_str_iter(path_entry_separator).collect();
-            env_path_components.map(|&s| Path(s))
-        }
-        None => ~[]
-    };
-    let cwd = os::getcwd();
-    // now add in default entries
-    env_rust_path.push(copy cwd);
-    do cwd.each_parent() |p| { push_if_exists(&mut env_rust_path, p) };
-    let h = os::homedir();
-    for h.iter().advance |h| { push_if_exists(&mut env_rust_path, h); }
-    env_rust_path
+    ~[Path(".")]
 }
 
 pub static u_rwx: i32 = (S_IRUSR | S_IWUSR | S_IXUSR) as i32;

branches/snap-stage3/src/librustpkg/tests.rs

@@ -12,7 +12,7 @@
 
 use context::Ctx;
 use core::hashmap::HashMap;
-use core::{io, libc, os, result, run, str, vec};
+use core::{io, libc, os, result, run, str};
 use core::prelude::*;
 use extra::tempfile::mkdtemp;
 use core::run::ProcessOutput;
@@ -25,7 +25,7 @@ use path_util::{target_executable_in_workspace, target_library_in_workspace,
                make_dir_rwx, u_rwx, library_in_workspace,
                built_bench_in_workspace, built_test_in_workspace,
                built_library_in_workspace, built_executable_in_workspace,
-                installed_library_in_workspace, rust_path};
+                installed_library_in_workspace};
 use target::*;
 
 /// Returns the last-modified date as an Option
@@ -562,58 +562,13 @@ fn package_script_with_default_build() {
 }
 
 #[test]
-#[ignore (reason = "Un-ignore when #7071 is fixed")]
+#[ignore (reason = "RUST_PATH not yet implemented -- #5682")]
 fn rust_path_test() {
-    let dir_for_path = mkdtemp(&os::tmpdir(), "more_rust").expect("rust_path_test failed");
-    let dir = mk_workspace(&dir_for_path, &normalize(RemotePath(Path("foo"))), &NoVersion);
-    debug!("dir = %s", dir.to_str());
-    writeFile(&Path("/Users/tjc/more_rust/src/foo-0.1/main.rs"),
-              "fn main() { let _x = (); }");
-
-    let cwd = os::getcwd();
-    debug!("cwd = %s", cwd.to_str());
-    let mut prog = run::Process::new("rustpkg",
-                                     [~"install", ~"foo"],
-                                     run::ProcessOptions { env: Some(&[(~"RUST_PATH",
-                                                                       dir_for_path.to_str())]),
-                                                          dir: Some(&cwd),
-                                                          in_fd: None,
-                                                          out_fd: None,
-                                                          err_fd: None
-                                                         });
-    prog.finish_with_output();
-    assert_executable_exists(&dir_for_path, "foo");
-}
-
-#[test]
-fn rust_path_contents() {
-    let dir = mkdtemp(&os::tmpdir(), "rust_path").expect("rust_path_contents failed");
-    let abc = &dir.push("A").push("B").push("C");
-    assert!(os::mkdir_recursive(&abc.push(".rust"), u_rwx));
-    assert!(os::mkdir_recursive(&abc.pop().push(".rust"), u_rwx));
-    assert!(os::mkdir_recursive(&abc.pop().pop().push(".rust"), u_rwx));
-    assert!(do os::change_dir_locked(&dir.push("A").push("B").push("C")) {
-        let p = rust_path();
-        let cwd = os::getcwd().push(".rust");
-        let parent = cwd.pop().pop().push(".rust");
-        let grandparent = cwd.pop().pop().pop().push(".rust");
-        assert!(vec::contains(p, &cwd));
-        assert!(vec::contains(p, &parent));
-        assert!(vec::contains(p, &grandparent));
-        for p.iter().advance() |a_path| {
-            assert!(!a_path.components.is_empty());
-        }
-    });
-}
-
-#[test]
-fn rust_path_parse() {
-    os::setenv("RUST_PATH", "/a/b/c:/d/e/f:/g/h/i");
-    let paths = rust_path();
-    assert!(vec::contains(paths, &Path("/g/h/i")));
-    assert!(vec::contains(paths, &Path("/d/e/f")));
-    assert!(vec::contains(paths, &Path("/a/b/c")));
-    os::unsetenv("RUST_PATH");
+    let dir = mk_workspace(&Path("/home/more_rust"),
+                           &normalize(RemotePath(Path("foo"))),
+                           &NoVersion);
+  //  command_line_test("RUST_PATH=/home/rust:/home/more_rust rustpkg install foo");
+    command_line_test([~"install", ~"foo"], &dir);
 }
 
 #[test]

branches/snap-stage3/src/libstd/path.rs

@@ -382,15 +382,6 @@ impl Path {
             Some(ref st) => Some(st.st_mode as uint),
         }
     }
-
-    /// Execute a function on p as well as all of its ancestors
-    pub fn each_parent(&self, f: &fn(&Path)) {
-        if !self.components.is_empty() {
-            f(self);
-            self.pop().each_parent(f);
-        }
-    }
-
 }
 
 #[cfg(target_os = "freebsd")]