---

yaml
---
r: 41716
b: refs/heads/master
c: 38315fb
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ac85bf356f3674ed0e0e79668b384141d38e0efe
+refs/heads/master: 38315fb007939e0fcaad825a5e08b9ab729cd5bd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/doc/tutorial-macros.md

@@ -115,7 +115,7 @@ to transcribe into the macro expansion; its type need not be repeated.
 The right-hand side must be enclosed by delimiters, which are ignored by the
 transcriber (therefore `() => ((1,2,3))` is a macro that expands to a tuple
 expression, `() => (let $x=$val)` is a macro that expands to a statement, and
-`() => (1,2,3)` is a macro that expands to a syntax errror).
+`() => (1,2,3)` is a macro that expands to a syntax error).
 
 Except for permissibility of `$name` (and `$(...)*`, discussed below), the
 right-hand side of a macro definition is ordinary Rust syntax. In particular,

trunk/src/libcore/option.rs

@@ -114,7 +114,7 @@ pub pure fn map_consume<T, U>(opt: Option<T>,
      * As `map`, but consumes the option and gives `f` ownership to avoid
      * copying.
      */
-    match opt { None => None, Some(v) => Some(f(v)) }
+    if opt.is_some() { Some(f(option::unwrap(move opt))) } else { None }
 }
 
 pub pure fn chain<T, U>(opt: Option<T>,
@@ -264,42 +264,12 @@ impl<T> Option<T> {
     #[inline(always)]
     pure fn map<U>(&self, f: fn(x: &T) -> U) -> Option<U> { map(self, f) }
 
-    /// As `map`, but consumes the option and gives `f` ownership to avoid
-    /// copying.
-    #[inline(always)]
-    pure fn map_consume<U>(self, f: fn(v: T) -> U) -> Option<U> {
-        map_consume(self, f)
-    }
-
     /// Applies a function to the contained value or returns a default
     #[inline(always)]
     pure fn map_default<U>(&self, def: U, f: fn(x: &T) -> U) -> U {
         map_default(self, move def, f)
     }
 
-    /// As `map_default`, but consumes the option and gives `f`
-    /// ownership to avoid copying.
-    #[inline(always)]
-    pure fn map_consume_default<U>(self, def: U, f: fn(v: T) -> U) -> U {
-        match self { None => def, Some(v) => f(v) }
-    }
-
-    /// Apply a function to the contained value or do nothing
-    fn mutate(&mut self, f: fn(T) -> T) {
-        if self.is_some() {
-            *self = Some(f(self.swap_unwrap()));
-        }
-    }
-
-    /// Apply a function to the contained value or set it to a default
-    fn mutate_default(&mut self, def: T, f: fn(T) -> T) {
-        if self.is_some() {
-            *self = Some(f(self.swap_unwrap()));
-        } else {
-            *self = Some(def);
-        }
-    }
-
     /// Performs an operation on the contained value by reference
     #[inline(always)]
     pure fn iter(&self, f: fn(x: &T)) { iter(self, f) }
@@ -331,17 +301,6 @@ impl<T> Option<T> {
     #[inline(always)]
     pure fn unwrap(self) -> T { unwrap(self) }
 
-    /**
-     * The option dance. Moves a value out of an option type and returns it,
-     * replacing the original with `None`.
-     *
-     * # Failure
-     *
-     * Fails if the value equals `None`.
-     */
-    #[inline(always)]
-    fn swap_unwrap(&mut self) -> T { swap_unwrap(self) }
-
     /**
      * Gets the value out of an option, printing a specified message on
      * failure