---

yaml
---
r: 29958
b: refs/heads/incoming
c: 8b8e0c2
h: refs/heads/master
v: v3

Author: Daniel Patterson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 9bb2963b7e922a9e8939253bb131eda9f31ca125
+refs/heads/incoming: 8b8e0c2a452a5f408f1c02470b4af1a4b6609dbb
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/os.rs

@@ -465,16 +465,16 @@ fn homedir() -> option<Path> {
 }
 
 /**
- * Returns the path to a temporary directory, if known.
+ * Returns the path to a temporary directory.
  *
  * On Unix, returns the value of the 'TMPDIR' environment variable if it is
  * set and non-empty and '/tmp' otherwise.
  *
  * On Windows, returns the value of, in order, the 'TMP', 'TEMP',
- * 'USERPROFILE' environment variable if any are set and not the empty
- * string. Otherwise, tmpdir returns option::none.
+ * 'USERPROFILE' environment variable  if any are set and not the empty
+ * string. Otherwise, tmpdir returns the path to the Windows directory.
  */
-fn tmpdir() -> option<Path> {
+fn tmpdir() -> Path {
     return lookup();
 
     fn getenv_nonempty(v: Path) -> option<Path> {
@@ -490,15 +490,18 @@ fn tmpdir() -> option<Path> {
     }
 
     #[cfg(unix)]
-    fn lookup() -> option<Path> {
-        option::or(getenv_nonempty(~"TMPDIR"), some(~"/tmp"))
+    fn lookup() -> Path {
+        option::get_default(getenv_nonempty(~"TMPDIR"), ~"/tmp")
     }
 
     #[cfg(windows)]
-    fn lookup() -> option<Path> {
-        option::or(getenv_nonempty(~"TMP"),
-        option::or(getenv_nonempty(~"TEMP"),
-                   getenv_nonempty(~"USERPROFILE")))
+    fn lookup() -> Path {
+        option::get_default(
+                    option::or(getenv_nonempty(~"TMP"),
+                    option::or(getenv_nonempty(~"TEMP"),
+                    option::or(getenv_nonempty(~"USERPROFILE"),
+                               getenv_nonempty(~"WINDIR")))),
+                    ~"C:\\Windows")
     }
 }
 /// Recursively walk a directory structure
@@ -970,7 +973,7 @@ mod tests {
 
     #[test]
     fn tmpdir() {
-        option::iter(os::tmpdir(), |s| assert !str::is_empty(s));
+        assert !str::is_empty(os::tmpdir());
     }
 
     // Issue #712