---

erickt · erickt · commit 25a898eeb0de · 2013-09-13T07:09:32.000-07:00
yaml --- r: 80748 b: refs/heads/try c: 93683ae h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
-refs/heads/try: 28eb49bfbf7c7e4ece981bc3434e0809890304d6
+refs/heads/try: 93683ae6da3a47f1cd0644a093cb4b1b0bee7faa
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/libstd/os.rs b/branches/try/src/libstd/os.rs
@@ -620,7 +620,7 @@ pub fn tmpdir() -> Path {
         getenv_nonempty("TMP").or(
             getenv_nonempty("TEMP").or(
                 getenv_nonempty("USERPROFILE").or(
-                   getenv_nonempty("WINDIR")))).unwrap_or_default(Path("C:\\Windows"))
+                   getenv_nonempty("WINDIR")))).unwrap_or(Path("C:\\Windows"))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ pub fn tmpdir() -> Path {`
`620`	`620`	`getenv_nonempty("TMP").or(`
`621`	`621`	`getenv_nonempty("TEMP").or(`
`622`	`622`	`getenv_nonempty("USERPROFILE").or(`
`623`		`- getenv_nonempty("WINDIR")))).unwrap_or_default(Path("C:\\Windows"))`
	`623`	`+ getenv_nonempty("WINDIR")))).unwrap_or(Path("C:\\Windows"))`
`624`	`624`	`}`
`625`	`625`	`}`
`626`	`626`