---

yaml
---
r: 40433
b: refs/heads/dist-snap
c: 053ba74
h: refs/heads/master
i:
  40431: 7f4211d
v: v3

Author: jesse99

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: ec8bfdd63c18cc986cedf8b891773e844a438586
+refs/heads/dist-snap: 053ba742c5829b95c760420762b3f4d61438fc1f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/time.rs

@@ -152,6 +152,89 @@ pub fn now() -> Tm {
 
 /// Parses the time from the string according to the format string.
 pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {
+    do_strptime(s, format)
+}
+
+pub fn strftime(format: &str, tm: Tm) -> ~str {
+    do_strftime(format, tm)
+}
+
+impl Tm {
+    /// Convert time to the seconds from January 1, 1970
+    fn to_timespec() -> Timespec {
+        let mut sec = 0i64;
+        if self.tm_gmtoff == 0_i32 {
+            rustrt::rust_timegm(self, &mut sec);
+        } else {
+            rustrt::rust_mktime(self, &mut sec);
+        }
+        { sec: sec, nsec: self.tm_nsec }
+    }
+
+    /// Convert time to the local timezone
+    fn to_local() -> Tm {
+        at(self.to_timespec())
+    }
+
+    /// Convert time to the UTC
+    fn to_utc() -> Tm {
+        at_utc(self.to_timespec())
+    }
+
+    /**
+     * Return a string of the current time in the form
+     * "Thu Jan  1 00:00:00 1970".
+     */
+    fn ctime() -> ~str { self.strftime(~"%c") }
+
+    /// Formats the time according to the format string.
+    fn strftime(format: &str) -> ~str { strftime(format, self) }
+
+    /**
+     * Returns a time string formatted according to RFC 822.
+     *
+     * local: "Thu, 22 Mar 2012 07:53:18 PST"
+     * utc:   "Thu, 22 Mar 2012 14:53:18 UTC"
+     */
+    fn rfc822() -> ~str {
+        if self.tm_gmtoff == 0_i32 {
+            self.strftime(~"%a, %d %b %Y %T GMT")
+        } else {
+            self.strftime(~"%a, %d %b %Y %T %Z")
+        }
+    }
+
+    /**
+     * Returns a time string formatted according to RFC 822 with Zulu time.
+     *
+     * local: "Thu, 22 Mar 2012 07:53:18 -0700"
+     * utc:   "Thu, 22 Mar 2012 14:53:18 -0000"
+     */
+    fn rfc822z() -> ~str {
+        self.strftime(~"%a, %d %b %Y %T %z")
+    }
+
+    /**
+     * Returns a time string formatted according to ISO 8601.
+     *
+     * local: "2012-02-22T07:53:18-07:00"
+     * utc:   "2012-02-22T14:53:18Z"
+     */
+    fn rfc3339() -> ~str {
+        if self.tm_gmtoff == 0_i32 {
+            self.strftime(~"%Y-%m-%dT%H:%M:%SZ")
+        } else {
+            let s = self.strftime(~"%Y-%m-%dT%H:%M:%S");
+            let sign = if self.tm_gmtoff > 0_i32 { '+' } else { '-' };
+            let mut m = i32::abs(self.tm_gmtoff) / 60_i32;
+            let h = m / 60_i32;
+            m -= h * 60_i32;
+            s + fmt!("%c%02d:%02d", sign, h as int, m as int)
+        }
+    }
+}
+
+priv fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
     type TmMut = {
        mut tm_sec: i32,
        mut tm_min: i32,
@@ -592,7 +675,7 @@ pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {
     }
 }
 
-fn strftime(format: &str, tm: Tm) -> ~str {
+priv fn do_strftime(format: &str, tm: Tm) -> ~str {
     fn parse_type(ch: char, tm: &Tm) -> ~str {
         //FIXME (#2350): Implement missing types.
       let die = || fmt!("strftime: can't understand this format %c ", ch);
@@ -759,81 +842,6 @@ fn strftime(format: &str, tm: Tm) -> ~str {
     buf
 }
 
-impl Tm {
-    /// Convert time to the seconds from January 1, 1970
-    fn to_timespec() -> Timespec {
-        let mut sec = 0i64;
-        if self.tm_gmtoff == 0_i32 {
-            rustrt::rust_timegm(self, &mut sec);
-        } else {
-            rustrt::rust_mktime(self, &mut sec);
-        }
-        { sec: sec, nsec: self.tm_nsec }
-    }
-
-    /// Convert time to the local timezone
-    fn to_local() -> Tm {
-        at(self.to_timespec())
-    }
-
-    /// Convert time to the UTC
-    fn to_utc() -> Tm {
-        at_utc(self.to_timespec())
-    }
-
-    /**
-     * Return a string of the current time in the form
-     * "Thu Jan  1 00:00:00 1970".
-     */
-    fn ctime() -> ~str { self.strftime(~"%c") }
-
-    /// Formats the time according to the format string.
-    fn strftime(format: &str) -> ~str { strftime(format, self) }
-
-    /**
-     * Returns a time string formatted according to RFC 822.
-     *
-     * local: "Thu, 22 Mar 2012 07:53:18 PST"
-     * utc:   "Thu, 22 Mar 2012 14:53:18 UTC"
-     */
-    fn rfc822() -> ~str {
-        if self.tm_gmtoff == 0_i32 {
-            self.strftime(~"%a, %d %b %Y %T GMT")
-        } else {
-            self.strftime(~"%a, %d %b %Y %T %Z")
-        }
-    }
-
-    /**
-     * Returns a time string formatted according to RFC 822 with Zulu time.
-     *
-     * local: "Thu, 22 Mar 2012 07:53:18 -0700"
-     * utc:   "Thu, 22 Mar 2012 14:53:18 -0000"
-     */
-    fn rfc822z() -> ~str {
-        self.strftime(~"%a, %d %b %Y %T %z")
-    }
-
-    /**
-     * Returns a time string formatted according to ISO 8601.
-     *
-     * local: "2012-02-22T07:53:18-07:00"
-     * utc:   "2012-02-22T14:53:18Z"
-     */
-    fn rfc3339() -> ~str {
-        if self.tm_gmtoff == 0_i32 {
-            self.strftime(~"%Y-%m-%dT%H:%M:%SZ")
-        } else {
-            let s = self.strftime(~"%Y-%m-%dT%H:%M:%S");
-            let sign = if self.tm_gmtoff > 0_i32 { '+' } else { '-' };
-            let mut m = i32::abs(self.tm_gmtoff) / 60_i32;
-            let h = m / 60_i32;
-            m -= h * 60_i32;
-            s + fmt!("%c%02d:%02d", sign, h as int, m as int)
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     #[legacy_exports];