diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 1ac1b78f3ec..b9c1d8cbc0e 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -341,15 +341,10 @@ fn iter_vec2(ss: &[S], ts: &[T], } /// Unwraps a result, assuming it is an `ok(T)` -fn unwrap(-res: Result) -> T { - unsafe { - let addr = match res { - Ok(x) => ptr::addr_of(x), - Err(_) => fail ~"error result" - }; - let liberated_value = unsafe::reinterpret_cast(*addr); - unsafe::forget(res); - return liberated_value; +fn unwrap(+res: Result) -> T { + match move res { + Ok(move t) => t, + Err(_) => fail ~"unwrap called on an err result" } }