---

yaml
---
r: 95140
b: refs/heads/dist-snap
c: ee114b6
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: aaeb7605c9aeb09374563ac7a427dfbd7d1f7892
+refs/heads/dist-snap: ee114b6cb15049a6be77c70c24c42db23e675e54
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -734,59 +734,6 @@ fn do_strptime(s: &str, format: &str) -> Result<Tm, ~str> {
 }
 
 fn do_strftime(format: &str, tm: &Tm) -> ~str {
-    fn days_in_year(year: int) -> i32 {
-        if ((year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0))) {
-            366    /* Days in a leap year */
-        } else {
-            365    /* Days in a non-leap year */
-        }
-    }
-
-    fn iso_week_days(yday: i32, wday: i32) -> int {
-        /* The number of days from the first day of the first ISO week of this
-        * year to the year day YDAY with week day WDAY.
-        * ISO weeks start on Monday. The first ISO week has the year's first
-        * Thursday.
-        * YDAY may be as small as yday_minimum.
-        */
-        let yday: int = yday as int;
-        let wday: int = wday as int;
-        let iso_week_start_wday: int = 1;                     /* Monday */
-        let iso_week1_wday: int = 4;                          /* Thursday */
-        let yday_minimum: int = 366;
-        /* Add enough to the first operand of % to make it nonnegative. */
-        let big_enough_multiple_of_7: int = (yday_minimum / 7 + 2) * 7;
-
-        yday - (yday - wday + iso_week1_wday + big_enough_multiple_of_7) % 7
-            + iso_week1_wday - iso_week_start_wday
-    }
-
-    fn iso_week(ch:char, tm: &Tm) -> ~str {
-        let mut year: int = tm.tm_year as int + 1900;
-        let mut days: int = iso_week_days (tm.tm_yday, tm.tm_wday);
-
-        if (days < 0) {
-            /* This ISO week belongs to the previous year. */
-            year -= 1;
-            days = iso_week_days (tm.tm_yday + (days_in_year(year)), tm.tm_wday);
-        } else {
-            let d: int = iso_week_days (tm.tm_yday - (days_in_year(year)),
-                                        tm.tm_wday);
-            if (0 <= d) {
-                /* This ISO week belongs to the next year. */
-                year += 1;
-                days = d;
-            }
-        }
-
-        match ch {
-            'G' => format!("{}", year),
-            'g' => format!("{:02d}", (year % 100 + 100) % 100),
-            'V' => format!("{:02d}", days / 7 + 1),
-            _ => ~""
-        }
-    }
-
     fn parse_type(ch: char, tm: &Tm) -> ~str {
         //FIXME (#2350): Implement missing types.
       let die = || format!("strftime: can't understand this format {} ", ch);
@@ -865,8 +812,8 @@ fn do_strftime(format: &str, tm: &Tm) -> ~str {
                 parse_type('m', tm),
                 parse_type('d', tm))
           }
-          'G' => iso_week('G', tm),
-          'g' => iso_week('g', tm),
+          //'G' {}
+          //'g' {}
           'H' => format!("{:02d}", tm.tm_hour),
           'I' => {
             let mut h = tm.tm_hour;
@@ -908,12 +855,12 @@ fn do_strftime(format: &str, tm: &Tm) -> ~str {
                 parse_type('S', tm))
           }
           't' => ~"\t",
-          'U' => format!("{:02d}", (tm.tm_yday - tm.tm_wday + 7) / 7),
+          //'U' {}
           'u' => {
             let i = tm.tm_wday as int;
             (if i == 0 { 7 } else { i }).to_str()
           }
-          'V' => iso_week('V', tm),
+          //'V' {}
           'v' => {
             format!("{}-{}-{}",
                 parse_type('e', tm),
@@ -1275,8 +1222,8 @@ mod tests {
         assert_eq!(local.strftime("%e"), ~"13");
         assert_eq!(local.strftime("%f"), ~"000054321");
         assert_eq!(local.strftime("%F"), ~"2009-02-13");
-        assert_eq!(local.strftime("%G"), ~"2009");
-        assert_eq!(local.strftime("%g"), ~"09");
+        // assert!(local.strftime("%G") == "2009");
+        // assert!(local.strftime("%g") == "09");
         assert_eq!(local.strftime("%H"), ~"15");
         assert_eq!(local.strftime("%I"), ~"03");
         assert_eq!(local.strftime("%j"), ~"044");
@@ -1293,9 +1240,9 @@ mod tests {
         assert_eq!(local.strftime("%s"), ~"1234567890");
         assert_eq!(local.strftime("%T"), ~"15:31:30");
         assert_eq!(local.strftime("%t"), ~"\t");
-        assert_eq!(local.strftime("%U"), ~"06");
+        // assert!(local.strftime("%U") == "06");
         assert_eq!(local.strftime("%u"), ~"5");
-        assert_eq!(local.strftime("%V"), ~"07");
+        // assert!(local.strftime("%V") == "07");
         assert_eq!(local.strftime("%v"), ~"13-Feb-2009");
         // assert!(local.strftime("%W") == "06");
         assert_eq!(local.strftime("%w"), ~"5");