From: Brian Anderson <banderson@mozilla.com>
Date: Sat, 7 Jan 2012 00:38:08 +0000 (-0800)
Subject: rustc: Use std::homedir to locate /home/banderson
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=396a8bd4e5fd267e8ead1b31d586feb4790b9c33;p=rust.git

rustc: Use std::homedir to locate /home/banderson

Issue #1359
---

diff --git a/src/comp/util/filesearch.rs b/src/comp/util/filesearch.rs
index e4ac615d973..e030ddeed40 100644
--- a/src/comp/util/filesearch.rs
+++ b/src/comp/util/filesearch.rs
@@ -111,10 +111,10 @@ fn get_cargo_root() -> result::t<fs::path, str> {
     alt generic_os::getenv("CARGO_ROOT") {
         some(_p) { result::ok(_p) }
         none. {
-            alt generic_os::getenv("HOME") {
-                some(_q) { result::ok(fs::connect(_q, ".cargo")) }
-                none. { result::err("no CARGO_ROOT or HOME") }
-            }
+          alt fs::homedir() {
+            some(_q) { result::ok(fs::connect(_q, ".cargo")) }
+            none. { result::err("no CARGO_ROOT or home directory") }
+          }
         }
     }
 }