---

yaml
---
r: 64497
b: refs/heads/snap-stage3
c: 5a9b33a
h: refs/heads/master
i:
  64495: 36a5c89
v: v3

Author: bblum

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 96c1082f0fdbbe5258cfc1dc37f83052feff8421
+refs/heads/snap-stage3: 5a9b33a76d76a77d2ced1c2430a25faa0f284071
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/option.rs

@@ -200,6 +200,20 @@ impl<T> Option<T> {
         match self { None => def, Some(v) => f(v) }
     }
 
+    /// As `map_consume`, but swaps a None into the original option rather
+    /// than consuming it by-value.
+    #[inline]
+    pub fn take_map<U>(&mut self, blk: &fn(T) -> U) -> Option<U> {
+        util::replace(self, None).map_consume(blk)
+    }
+
+    /// As `map_consume_default`, but swaps a None into the original option
+    /// rather than consuming it by-value.
+    #[inline]
+    pub fn take_map_default<U> (&mut self, def: U, blk: &fn(T) -> U) -> U {
+        util::replace(self, None).map_consume_default(def, blk)
+    }
+
     /// Apply a function to the contained value or do nothing
     pub fn mutate(&mut self, f: &fn(T) -> T) {
         if self.is_some() {