Skip to content

Commit

Permalink
std: Fix another windows problem with the unwrap_or_default rename
Browse files Browse the repository at this point in the history
  • Loading branch information
erickt committed Sep 13, 2013
1 parent 28eb49b commit 93683ae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/os.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}

Expand Down

9 comments on commit 93683ae

@bors
Copy link
Contributor

@bors bors commented on 93683ae Sep 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from erickt
at erickt@93683ae

@bors
Copy link
Contributor

@bors bors commented on 93683ae Sep 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging erickt/rust/master = 93683ae into auto

@bors
Copy link
Contributor

@bors bors commented on 93683ae Sep 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

erickt/rust/master = 93683ae merged ok, testing candidate = 0037f8fa

@bors
Copy link
Contributor

@bors bors commented on 93683ae Sep 14, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from erickt
at erickt@93683ae

@bors
Copy link
Contributor

@bors bors commented on 93683ae Sep 14, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging erickt/rust/master = 93683ae into auto

@bors
Copy link
Contributor

@bors bors commented on 93683ae Sep 14, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

erickt/rust/master = 93683ae merged ok, testing candidate = 2aa578e

@bors
Copy link
Contributor

@bors bors commented on 93683ae Sep 14, 2013

@bors
Copy link
Contributor

@bors bors commented on 93683ae Sep 14, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 2aa578e

Please sign in to comment.