about summary refs log tree commit diff
path: root/src/libstd/option.rs
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-09-09 19:57:08 -0700
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-09-12 18:54:11 -0700
commit45c62c08f9740dfcdf64c64c8b183acfc22fb3d6 (patch)
tree9b07570e252c12f1f20ea7caf151b13ad6a169a6 /src/libstd/option.rs
parent761ae0035731ebc5c9e42b331fa86fb0385ad9f1 (diff)
downloadrust-45c62c08f9740dfcdf64c64c8b183acfc22fb3d6.tar.gz
rust-45c62c08f9740dfcdf64c64c8b183acfc22fb3d6.zip
std: rename Option::unwrap_or_default() to unwrap_or()
Diffstat (limited to 'src/libstd/option.rs')
-rw-r--r--src/libstd/option.rs2
1 files changed, 1 insertions, 1 deletions
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