---

yaml
---
r: 36339
b: refs/heads/try2
c: 7c87ff3
h: refs/heads/master
i:
  36337: fc0df07
  36335: a925f85
v: v3

Author: jesse99

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 053ba742c5829b95c760420762b3f4d61438fc1f
+refs/heads/try2: 7c87ff3f289195c564976ee49222487f2de836cd
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/time.rs

@@ -155,6 +155,7 @@ pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {
     do_strptime(s, format)
 }
 
+/// Formats the time according to the format string.
 pub fn strftime(format: &str, tm: Tm) -> ~str {
     do_strftime(format, tm)
 }
@@ -235,21 +236,6 @@ impl Tm {
 }
 
 priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
-    type TmMut = {
-       mut tm_sec: i32,
-       mut tm_min: i32,
-       mut tm_hour: i32,
-       mut tm_mday: i32,
-       mut tm_mon: i32,
-       mut tm_year: i32,
-       mut tm_wday: i32,
-       mut tm_yday: i32,
-       mut tm_isdst: i32,
-       mut tm_gmtoff: i32,
-       mut tm_zone: ~str,
-       mut tm_nsec: i32,
-    };
-
     fn match_str(s: &str, pos: uint, needle: &str) -> bool {
         let mut i = pos;
         for str::each(needle) |ch| {
@@ -312,7 +298,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
         }
     }
 
-    fn parse_type(s: &str, pos: uint, ch: char, tm: &TmMut)
+    fn parse_type(s: &str, pos: uint, ch: char, tm: &mut Tm_)
       -> Result<uint, ~str> {
         match ch {
           'A' => match match_strs(s, pos, ~[
@@ -623,19 +609,19 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
     }
 
     do io::with_str_reader(str::from_slice(format)) |rdr| {
-        let tm = {
-            mut tm_sec: 0_i32,
-            mut tm_min: 0_i32,
-            mut tm_hour: 0_i32,
-            mut tm_mday: 0_i32,
-            mut tm_mon: 0_i32,
-            mut tm_year: 0_i32,
-            mut tm_wday: 0_i32,
-            mut tm_yday: 0_i32,
-            mut tm_isdst: 0_i32,
-            mut tm_gmtoff: 0_i32,
-            mut tm_zone: ~"",
-            mut tm_nsec: 0_i32,
+        let mut tm = {
+            tm_sec: 0_i32,
+            tm_min: 0_i32,
+            tm_hour: 0_i32,
+            tm_mday: 0_i32,
+            tm_mon: 0_i32,
+            tm_year: 0_i32,
+            tm_wday: 0_i32,
+            tm_yday: 0_i32,
+            tm_isdst: 0_i32,
+            tm_gmtoff: 0_i32,
+            tm_zone: ~"",
+            tm_nsec: 0_i32,
         };
         let mut pos = 0u;
         let len = str::len(s);
@@ -645,7 +631,7 @@ priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
             let {ch, next} = str::char_range_at(s, pos);
 
             match rdr.read_char() {
-              '%' => match parse_type(s, pos, rdr.read_char(), &tm) {
+              '%' => match parse_type(s, pos, rdr.read_char(), &mut tm) {
                 Ok(next) => pos = next,
                   Err(copy e) => { result = Err(e); break; }
               },