---

yaml
---
r: 41711
b: refs/heads/master
c: ca93583
h: refs/heads/master
i:
  41709: 9d10d0f
  41707: ae4f7f7
  41703: 7c6bc95
  41695: a2b04cd
v: v3

Author: ScriptDevil

[refs]

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

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,26 +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) }
-    }
-
     /// Performs an operation on the contained value by reference
     #[inline(always)]
     pure fn iter(&self, f: fn(x: &T)) { iter(self, f) }
@@ -315,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

trunk/src/libstd/time.rs

@@ -460,7 +460,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
                 tm.tm_yday = v - 1_i32;
                 Ok(pos)
               }
-              None => Err(~"Invalid year")
+              None => Err(~"Invalid day of year")
             }
           }
           'k' => {
@@ -554,7 +554,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
                 tm.tm_wday = v;
                 Ok(pos)
               }
-              None => Err(~"Invalid weekday")
+              None => Err(~"Invalid day of week")
             }
           }
           'v' => {
@@ -569,7 +569,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
             // FIXME (#2350): range check.
             match match_digits(s, pos, 1u, false) {
               Some(item) => { let (v, pos) = item; tm.tm_wday = v; Ok(pos) }
-              None => Err(~"Invalid weekday")
+              None => Err(~"Invalid day of week")
             }
           }
           //'X' {}
@@ -582,7 +582,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
                 tm.tm_year = v - 1900_i32;
                 Ok(pos)
               }
-              None => Err(~"Invalid weekday")
+              None => Err(~"Invalid year")
             }
           }
           'y' => {
@@ -593,7 +593,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
                 tm.tm_year = v - 1900_i32;
                 Ok(pos)
               }
-              None => Err(~"Invalid weekday")
+              None => Err(~"Invalid year")
             }
           }
           'Z' => {