about summary refs log tree commit diff
path: root/src/libstd/path
diff options
context:
space:
mode:
authorMarvin Löbel <loebel.marvin@gmail.com>2013-12-06 19:51:10 +0100
committerMarvin Löbel <loebel.marvin@gmail.com>2014-01-08 00:53:40 +0100
commit90b394514dad9df9c55b795be724093765d9df3a (patch)
tree7e14d65e0e865662485c6f9f0dd2ca9fdcdb619f /src/libstd/path
parent4329fc6730e381b3b06f9987327072c50a739ad4 (diff)
downloadrust-90b394514dad9df9c55b795be724093765d9df3a.tar.gz
rust-90b394514dad9df9c55b795be724093765d9df3a.zip
Renamed Option::map_default and mutate_default to map_or and mutate_or_set
Diffstat (limited to 'src/libstd/path')
-rw-r--r--src/libstd/path/windows.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index 114f675cdba..913b314c00b 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -255,7 +255,7 @@ impl GenericPathUnsafe for Path {
             // if me is verbatim, we need to pre-normalize the new path
             let path_ = if is_verbatim(me) { Path::normalize__(path, None) }
                         else { None };
-            let pathlen = path_.as_ref().map_default(path.len(), |p| p.len());
+            let pathlen = path_.as_ref().map_or(path.len(), |p| p.len());
             let mut s = str::with_capacity(me.repr.len() + 1 + pathlen);
             s.push_str(me.repr);
             let plen = me.prefix_len();