std: rename Option::unwrap_or_default() to unwrap_or()

4 files changed, 4 insertions, 4 deletions

diff --git a/src/libstd/at_vec.rs b/src/libstd/at_vec.rs
index a4e841f98f8..ce8e90e1a43 100644
--- a/src/libstd/at_vec.rs
+++ b/src/libstd/at_vec.rs
@@ -45,7 +45,7 @@ pub fn capacity<T>(v: @[T]) -> uint {
 #[inline]
 pub fn build<A>(size: Option<uint>, builder: &fn(push: &fn(v: A))) -> @[A] {
     let mut vec = @[];
-    unsafe { raw::reserve(&mut vec, size.unwrap_or_default(4)); }
+    unsafe { raw::reserve(&mut vec, size.unwrap_or(4)); }
     builder(|x| unsafe { raw::push(&mut vec, x) });
     vec
 }
diff --git a/src/libstd/option.rs b/src/libstd/option.rs
index b72046cce72..5ac6fcda043 100644
--- a/src/libstd/option.rs
+++ b/src/libstd/option.rs
@@ -332,7 +332,7 @@ impl<T> Option<T> {
 
     /// Returns the contained value or a default
     #[inline]
-    pub fn unwrap_or_default(self, def: T) -> T {
+    pub fn unwrap_or(self, def: T) -> T {
         match self {
             Some(x) => x,
             None => def
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index ab1210aabad..95a75b84923 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -611,7 +611,7 @@ pub fn tmpdir() -> Path {
         if cfg!(target_os = "android") {
             Path("/data/tmp")
         } else {
-            getenv_nonempty("TMPDIR").unwrap_or_default(Path("/tmp"))
+            getenv_nonempty("TMPDIR").unwrap_or(Path("/tmp"))
         }
     }
 
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index 1ff58351886..55b8e3769ea 100644
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -205,7 +205,7 @@ pub fn with_capacity<T>(capacity: uint) -> ~[T] {
  */
 #[inline]
 pub fn build<A>(size: Option<uint>, builder: &fn(push: &fn(v: A))) -> ~[A] {
-    let mut vec = with_capacity(size.unwrap_or_default(4));
+    let mut vec = with_capacity(size.unwrap_or(4));
     builder(|x| vec.push(x));
     vec
 }