mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change option::expect to not require a Copy bound, and move instead.

Browse Source
This commit is contained in:
Brian J. Burg 2012-11-08 16:25:22 -08:00
parent 17020244e4
commit a5718ba377
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libcore/option.rs
View File

@ -85,16 +85,17 @@ pub enum Option<T> {
}
}
pub pure fn expect<T: Copy>(opt: Option<T>, reason: ~str) -> T {
pub pure fn expect<T>(opt: Option<T>, reason: ~str) -> T {
/*!
* Gets the value out of an option, printing a specified message on
* failure
* Gets the value out of an option without copying, printing a
* specified message on failure.
*
* # Failure
*
* Fails if the value equals `none`
*/
match opt { Some(copy x) => x, None => fail reason }
if opt.is_some() { move option::unwrap(move opt) }
else { fail reason }
}
pub pure fn map<T, U>(opt: &Option<T>, f: fn(x: &T) -> U) -> Option<U> {