diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 3237269e4a64fb0dbe8a22e9822055c327e4ae29..46f4427e8387e67074bfa9a0c49d9fa8a1cce5af 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -508,12 +508,19 @@ pub fn unwrap_or(self, optb: T) -> T { /// Unwraps a result, yielding the content of an `Ok`. /// If the value is an `Err` then it calls `op` with its value. #[inline] - pub fn unwrap_or_handle(self, op: |E| -> T) -> T { + pub fn unwrap_or_else(self, op: |E| -> T) -> T { match self { Ok(t) => t, Err(e) => op(e) } } + + /// Deprecated name for `unwrap_or_else()`. + #[deprecated = "replaced by .unwrap_or_else()"] + #[inline] + pub fn unwrap_or_handle(self, op: |E| -> T) -> T { + self.unwrap_or_else(op) + } } impl Result { @@ -758,8 +765,8 @@ fn handler(msg: ~str) -> int { let ok: Result = Ok(100); let ok_err: Result = Err("I got this.".to_owned()); - assert_eq!(ok.unwrap_or_handle(handler), 100); - assert_eq!(ok_err.unwrap_or_handle(handler), 50); + assert_eq!(ok.unwrap_or_else(handler), 100); + assert_eq!(ok_err.unwrap_or_else(handler), 50); } #[test] @@ -774,6 +781,6 @@ fn handler(msg: ~str) -> int { } let bad_err: Result = Err("Unrecoverable mess.".to_owned()); - let _ : int = bad_err.unwrap_or_handle(handler); + let _ : int = bad_err.unwrap_or_else(handler); } }