Refactored iter and mut_iter

Replaced match by self.as_ref() and self.as_mut()
rust-lang · Mar 14, 2014 · a7d3637 · a7d3637 · bors · Mar 14, 2014
1 parent dcf320a
commit a7d3637
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/libstd/option.rs b/src/libstd/option.rs
@@ -211,19 +211,13 @@ impl<T> Option<T> {
     /// Return an iterator over the possibly contained value
     #[inline]
     pub fn iter<'r>(&'r self) -> Item<&'r T> {
-        match *self {
-            Some(ref x) => Item{opt: Some(x)},
-            None => Item{opt: None}
-        }
+        Item{opt: self.as_ref()}
     }
 
     /// Return a mutable iterator over the possibly contained value
     #[inline]
     pub fn mut_iter<'r>(&'r mut self) -> Item<&'r mut T> {
-        match *self {
-            Some(ref mut x) => Item{opt: Some(x)},
-            None => Item{opt: None}
-        }
+        Item{opt: self.as_mut()}
     }
 
     /// Return a consuming iterator over the possibly contained value