squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

auto merge of #12931 : aochagavia/rust/option-take_unwrap, r=cmr

Browse source 
Using pattern matching instead of is_some + unwrap
This commit is contained in:
bors 2014-03-16 14:11:26 -07:00
commit 9e89ffc60e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/option.rs
View file

@ -311,10 +311,10 @@ impl<T> Option<T> {
/// Fails if the value equals `None`.
#[inline]
pub fn take_unwrap(&mut self) -> T {
if self.is_none() {
fail!("called `Option::take_unwrap()` on a `None` value")
match self.take() {
Some(x) => x,
None => fail!("called `Option::take_unwrap()` on a `None` value")
}
self.take().unwrap()
}
/// Gets an immutable reference to the value inside an option.