---

yaml
---
r: 145687
b: refs/heads/try2
c: ccd9a96
h: refs/heads/master
i:
  145685: d1e9d3e
  145683: b0efeb9
  145679: 4ce65ae
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4dc3ff9c80bab9da65f3a8323882ec082a80bbeb
+refs/heads/try2: ccd9a963f75074da506c05fece1e3c965e742c51
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/getopts.rs

@@ -85,13 +85,15 @@ use std::vec;
 
 /// Name of an option. Either a string or a single char.
 #[deriving(Clone, Eq)]
+#[allow(missing_doc)]
 pub enum Name {
     Long(~str),
     Short(char),
 }
 
 /// Describes whether an option has an argument.
 #[deriving(Clone, Eq)]
+#[allow(missing_doc)]
 pub enum HasArg {
     Yes,
     No,
@@ -100,6 +102,7 @@ pub enum HasArg {
 
 /// Describes how often an option may occur.
 #[deriving(Clone, Eq)]
+#[allow(missing_doc)]
 pub enum Occur {
     Req,
     Optional,
@@ -141,6 +144,7 @@ pub struct Matches {
 /// The type returned when the command line does not conform to the
 /// expected format. Pass this value to <fail_str> to get an error message.
 #[deriving(Clone, Eq, ToStr)]
+#[allow(missing_doc)]
 pub enum Fail_ {
     ArgumentMissing(~str),
     UnrecognizedOption(~str),
@@ -151,6 +155,7 @@ pub enum Fail_ {
 
 /// The type of failure that occured.
 #[deriving(Eq)]
+#[allow(missing_doc)]
 pub enum FailType {
     ArgumentMissing_,
     UnrecognizedOption_,

branches/try2/src/libextra/list.rs

@@ -13,12 +13,14 @@
 
 
 #[deriving(Clone, Eq)]
+#[allow(missing_doc)]
 pub enum List<T> {
     Cons(T, @List<T>),
     Nil,
 }
 
 #[deriving(Eq)]
+#[allow(missing_doc)]
 pub enum MutList<T> {
     MutCons(T, @mut MutList<T>),
     MutNil,

branches/try2/src/libextra/semver.rs

@@ -38,6 +38,7 @@ use std::to_str::ToStr;
 /// An identifier in the pre-release or build metadata. If the identifier can
 /// be parsed as a decimal value, it will be represented with `Numeric`.
 #[deriving(Clone, Eq)]
+#[allow(missing_doc)]
 pub enum Identifier {
     Numeric(uint),
     AlphaNumeric(~str)

branches/try2/src/libextra/terminfo/parm.rs

@@ -39,6 +39,7 @@ enum FormatState {
 
 /// Types of parameters a capability can use
 #[deriving(Clone)]
+#[allow(missing_doc)]
 pub enum Param {
     String(~str),
     Number(int)

branches/try2/src/libextra/time.rs

@@ -734,8 +734,60 @@ 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);
         match ch {
           'A' => match tm.tm_wday as int {
@@ -812,8 +864,8 @@ fn do_strftime(format: &str, tm: &Tm) -> ~str {
                 parse_type('m', tm),
                 parse_type('d', tm))
           }
-          //'G' {}
-          //'g' {}
+          'G' => iso_week('G', tm),
+          'g' => iso_week('g', tm),
           'H' => format!("{:02d}", tm.tm_hour),
           'I' => {
             let mut h = tm.tm_hour;
@@ -855,22 +907,21 @@ fn do_strftime(format: &str, tm: &Tm) -> ~str {
                 parse_type('S', tm))
           }
           't' => ~"\t",
-          //'U' {}
+          'U' => format!("{:02d}", (tm.tm_yday - tm.tm_wday + 7) / 7),
           'u' => {
             let i = tm.tm_wday as int;
             (if i == 0 { 7 } else { i }).to_str()
           }
-          //'V' {}
+          'V' => iso_week('V', tm),
           'v' => {
             format!("{}-{}-{}",
                 parse_type('e', tm),
                 parse_type('b', tm),
                 parse_type('Y', tm))
           }
-          //'W' {}
+          'W' => format!("{:02d}", (tm.tm_yday - (tm.tm_wday - 1 + 7) % 7 + 7)
+                         / 7),
           'w' => (tm.tm_wday as int).to_str(),
-          //'X' {}
-          //'x' {}
           'Y' => (tm.tm_year as int + 1900).to_str(),
           'y' => format!("{:02d}", (tm.tm_year as int + 1900) % 100),
           'Z' => tm.tm_zone.clone(),
@@ -881,7 +932,7 @@ fn do_strftime(format: &str, tm: &Tm) -> ~str {
             m -= h * 60_i32;
             format!("{}{:02d}{:02d}", sign, h, m)
           }
-          //'+' {}
+          '+' => tm.rfc3339(),
           '%' => ~"%",
           _   => die()
         }
@@ -1222,8 +1273,8 @@ mod tests {
         assert_eq!(local.strftime("%e"), ~"13");
         assert_eq!(local.strftime("%f"), ~"000054321");
         assert_eq!(local.strftime("%F"), ~"2009-02-13");
-        // assert!(local.strftime("%G") == "2009");
-        // assert!(local.strftime("%g") == "09");
+        assert_eq!(local.strftime("%G"), ~"2009");
+        assert_eq!(local.strftime("%g"), ~"09");
         assert_eq!(local.strftime("%H"), ~"15");
         assert_eq!(local.strftime("%I"), ~"03");
         assert_eq!(local.strftime("%j"), ~"044");
@@ -1240,16 +1291,17 @@ mod tests {
         assert_eq!(local.strftime("%s"), ~"1234567890");
         assert_eq!(local.strftime("%T"), ~"15:31:30");
         assert_eq!(local.strftime("%t"), ~"\t");
-        // assert!(local.strftime("%U") == "06");
+        assert_eq!(local.strftime("%U"), ~"06");
         assert_eq!(local.strftime("%u"), ~"5");
-        // assert!(local.strftime("%V") == "07");
+        assert_eq!(local.strftime("%V"), ~"07");
         assert_eq!(local.strftime("%v"), ~"13-Feb-2009");
-        // assert!(local.strftime("%W") == "06");
+        assert_eq!(local.strftime("%W"), ~"06");
         assert_eq!(local.strftime("%w"), ~"5");
-        // handle "%X"
-        // handle "%x"
+        assert_eq!(local.strftime("%X"), ~"15:31:30"); // FIXME (#2350): support locale
+        assert_eq!(local.strftime("%x"), ~"02/13/09"); // FIXME (#2350): support locale
         assert_eq!(local.strftime("%Y"), ~"2009");
         assert_eq!(local.strftime("%y"), ~"09");
+        assert_eq!(local.strftime("%+"), ~"2009-02-13T15:31:30-08:00");
 
         // FIXME (#2350): We should probably standardize on the timezone
         // abbreviation.

branches/try2/src/libextra/uuid.rs

@@ -116,6 +116,7 @@ struct UuidFields {
 }
 
 /// Error details for string parsing failures
+#[allow(missing_doc)]
 pub enum ParseError {
     ErrorInvalidLength(uint),
     ErrorInvalidCharacter(char, uint),

branches/try2/src/librustc/middle/lint.rs

@@ -1351,6 +1351,18 @@ impl MissingDocLintVisitor {
         // otherwise, warn!
         cx.span_lint(missing_doc, sp, msg);
     }
+
+    fn check_struct(&mut self, cx: @mut Context, sdef: @ast::struct_def) {
+                        for field in sdef.fields.iter() {
+        match field.node.kind {
+            ast::named_field(_, vis) if vis != ast::private => {
+                self.check_attrs(cx, field.node.attrs, field.span,
+                        "missing documentation for a field");
+                }
+                ast::unnamed_field | ast::named_field(*) => {}
+            }
+        }
+    }
 }
 
 impl Visitor<@mut Context> for MissingDocLintVisitor {
@@ -1395,35 +1407,49 @@ impl SubitemStoppableVisitor for MissingDocLintVisitor {
     }
 
     fn visit_item_action(&mut self, it:@ast::item, cx:@mut Context) {
+            if it.vis != ast::public {
+                return;
+            }
 
             match it.node {
                 // Go ahead and match the fields here instead of using
                 // visit_struct_field while we have access to the enclosing
                 // struct's visibility
-                ast::item_struct(sdef, _) if it.vis == ast::public => {
+                ast::item_struct(sdef, _) => {
                     self.check_attrs(cx, it.attrs, it.span,
                                 "missing documentation for a struct");
-                    for field in sdef.fields.iter() {
-                        match field.node.kind {
-                            ast::named_field(_, vis) if vis != ast::private => {
-                                self.check_attrs(cx, field.node.attrs, field.span,
-                                            "missing documentation for a field");
-                            }
-                            ast::unnamed_field | ast::named_field(*) => {}
-                        }
-                    }
+                    self.check_struct(cx, sdef);
                 }
 
-                ast::item_trait(*) if it.vis == ast::public => {
+                ast::item_trait(*) => {
                     self.check_attrs(cx, it.attrs, it.span,
                                 "missing documentation for a trait");
                 }
 
-                ast::item_fn(*) if it.vis == ast::public => {
+                ast::item_fn(*) => {
                     self.check_attrs(cx, it.attrs, it.span,
                                 "missing documentation for a function");
                 }
 
+                ast::item_enum(ref edef, _) => {
+                    self.check_attrs(cx, it.attrs, it.span,
+                                "missing documentation for an enum");
+                    for variant in edef.variants.iter() {
+                        if variant.node.vis == ast::private {
+                            continue;
+                        }
+
+                        self.check_attrs(cx, variant.node.attrs, variant.span,
+                                        "missing documentation for a variant");
+                        match variant.node.kind {
+                            ast::struct_variant_kind(sdef) => {
+                                self.check_struct(cx, sdef);
+                            }
+                            _ => ()
+                        }
+                    }
+                }
+
                 _ => {}
             }
     }