about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-09-13 06:58:46 -0700
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-09-13 06:58:46 -0700
commit28eb49bfbf7c7e4ece981bc3434e0809890304d6 (patch)
tree058a68ad1c67091b2cb04774b692119512aa1f8c /src
parent7f9c5aae9e9d94b88cb7507633f449534d32c109 (diff)
downloadrust-28eb49bfbf7c7e4ece981bc3434e0809890304d6.tar.gz
rust-28eb49bfbf7c7e4ece981bc3434e0809890304d6.zip
std: rename Option.chain to Option.and_then on windows
Diffstat (limited to 'src')
-rw-r--r--src/libstd/os.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 95a75b84923..3a53edd1168 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -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 {