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

bors · bors · commit 9e89ffc60e4a · 2014-03-16T14:11:26.000-07:00
Using pattern matching instead of is_some + unwrap
diff --git a/src/libstd/option.rs b/src/libstd/option.rs
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -311,10 +311,10 @@ impl<T> Option<T> {`
`311`	`311`	/// Fails if the value equals `None`.
`312`	`312`	`#[inline]`
`313`	`313`	`pub fn take_unwrap(&mut self) -> T {`
`314`		`- if self.is_none() {`
`315`		- fail!("called `Option::take_unwrap()` on a `None` value")
	`314`	`+ match self.take() {`
	`315`	`+ Some(x) => x,`
	`316`	+ None => fail!("called `Option::take_unwrap()` on a `None` value")
`316`	`317`	`}`
`317`		`- self.take().unwrap()`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`/// Gets an immutable reference to the value inside an option.`