---

brson · brson · commit 4f210b5696e2 · 2012-01-06T16:38:29.000-08:00
yaml --- r: 7086 b: refs/heads/master c: 396a8bd h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b2f37253a77685a2f4454c9c31db650e9bb5522
+refs/heads/master: 396a8bd4e5fd267e8ead1b31d586feb4790b9c33
diff --git a/trunk/src/comp/util/filesearch.rs b/trunk/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") }
+          }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 4b2f37253a77685a2f4454c9c31db650e9bb5522`
	`2`	`+refs/heads/master: 396a8bd4e5fd267e8ead1b31d586feb4790b9c33`
Original file line number	Diff line number	Diff line change
`@@ -111,10 +111,10 @@ fn get_cargo_root() -> result::t<fs::path, str> {`
`111`	`111`	`alt generic_os::getenv("CARGO_ROOT") {`
`112`	`112`	`some(_p) { result::ok(_p) }`
`113`	`113`	`none. {`
`114`		`- alt generic_os::getenv("HOME") {`
`115`		`- some(_q) { result::ok(fs::connect(_q, ".cargo")) }`
`116`		`- none. { result::err("no CARGO_ROOT or HOME") }`
`117`		`- }`
	`114`	`+ alt fs::homedir() {`
	`115`	`+ some(_q) { result::ok(fs::connect(_q, ".cargo")) }`
	`116`	`+ none. { result::err("no CARGO_ROOT or home directory") }`
	`117`	`+ }`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`}`