OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement option::unwrap safely...!

Browse Source
This commit is contained in:
Ben Blum 2012-08-24 19:02:47 -04:00
parent bed37a1dc9
commit 6cf2f89452
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libcore/option.rs
View File

@ -44,13 +44,14 @@ pure fn get_ref<T>(opt: &r/option<T>) -> &r/T {
}
pure fn expect<T: copy>(opt: option<T>, reason: ~str) -> T {
#[doc = "
Gets the value out of an option, printing a specified message on failure
# Failure
Fails if the value equals `none`
"];
/*!
* Gets the value out of an option, printing a specified message on
* failure
*
* # Failure
*
* Fails if the value equals `none`
*/
match opt { some(x) => x, none => fail reason }
}
@ -165,15 +166,9 @@ pure fn unwrap<T>(+opt: option<T>) -> T {
* Useful primarily for getting strings, vectors and unique pointers out
* of option types without copying them.
*/
unsafe {
let addr = match opt {
some(x) => ptr::addr_of(x),
none => fail ~"option::unwrap none"
};
let liberated_value = unsafe::reinterpret_cast(*addr);
unsafe::forget(opt);
return liberated_value;
match move opt {
some(move x) => x,
none => fail ~"option::unwrap none"
}
}