Skip to content

Commit

Permalink
std: rename Option.chain to Option.and_then on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
erickt committed Sep 13, 2013
1 parent 7f9c5aa commit 28eb49b
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 @@ -569,7 +569,7 @@ pub fn homedir() -> Option<Path> {

#[cfg(windows)]
fn secondary() -> Option<Path> {
do getenv("USERPROFILE").chain |p| {
do getenv("USERPROFILE").and_then |p| {
if !p.is_empty() {
Some(Path(p))
} else {
Expand Down

4 comments on commit 28eb49b

@bors
Copy link
Contributor

@bors bors commented on 28eb49b 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@28eb49b

@bors
Copy link
Contributor

@bors bors commented on 28eb49b 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 = 28eb49b into auto

@bors
Copy link
Contributor

@bors bors commented on 28eb49b 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 = 28eb49b merged ok, testing candidate = a6d3b270

@bors
Copy link
Contributor

@bors bors commented on 28eb49b Sep 13, 2013

Please sign in to comment.