---

yaml
---
r: 42641
b: refs/heads/try
c: 5ff6bee
h: refs/heads/master
i:
  42639: c1f82f5
v: v3

Author: catamorphism

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 72c04a9ffe0f8d164599e2f24f02277f1499f089
+refs/heads/try: 5ff6beed60fe3a1b783968deda9b5ca99afbeba6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/metadata/filesearch.rs

@@ -148,10 +148,12 @@ fn get_cargo_root_nearest() -> Result<Path, ~str> {
     do result::chain(get_cargo_root()) |p| {
         let cwd = os::getcwd();
         let cwd_cargo = cwd.push(".cargo");
+        let cargo_is_non_root_file =
+            !os::path_is_dir(&cwd_cargo) && cwd_cargo != p;
         let mut par_cargo = cwd.pop().push(".cargo");
-        let mut rslt = result::Ok(copy cwd_cargo);  // XXX: Bad copy.
+        let mut rslt = result::Ok(cwd_cargo);
 
-        if !os::path_is_dir(&cwd_cargo) && cwd_cargo != p {
+        if cargo_is_non_root_file {
             while par_cargo != p {
                 if os::path_is_dir(&par_cargo) {
                     rslt = result::Ok(par_cargo);