---

yaml
---
r: 95142
b: refs/heads/dist-snap
c: b7fe83d
h: refs/heads/master
v: v3

Author: sfackler

[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: 353578a7b36c003da8f5ac818a1554cdb652f9c2
+refs/heads/dist-snap: b7fe83d573d8073f7d663bee5c0b3e1493b9998d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/etc/emacs/rust-mode-tests.el

@@ -196,35 +196,6 @@ This is some more text.  Fee fie fo fum.  Humpty dumpty sat on a wall.
  *very very very long string
  */"))
 
-(ert-deftest fill-paragraph-single-line-style-with-code-before ()
-  (test-fill-paragraph
-   "fn foo() { }
-/// This is my comment.  This is more of my comment.  This is even more."
-   "fn foo() { }
-/// This is my comment.  This is
-/// more of my comment.  This is
-/// even more." 14))
-
-(ert-deftest fill-paragraph-single-line-style-with-code-after ()
-  (test-fill-paragraph
-   "/// This is my comment.  This is more of my comment.  This is even more.
-fn foo() { }"
-   "/// This is my comment.  This is
-/// more of my comment.  This is
-/// even more.
-fn foo() { }" 1 73))
-
-(ert-deftest fill-paragraph-single-line-style-code-before-and-after ()
-  (test-fill-paragraph
-   "fn foo() { }
-/// This is my comment.  This is more of my comment.  This is even more.
-fn bar() { }"
-   "fn foo() { }
-/// This is my comment.  This is
-/// more of my comment.  This is
-/// even more.
-fn bar() { }" 14 67))
-
 (defun test-auto-fill (initial position inserted expected)
   (rust-test-manip-code 
    initial

branches/dist-snap/src/etc/emacs/rust-mode.el

@@ -300,8 +300,7 @@
         (let
             ((fill-paragraph-function
               (if (not (eq fill-paragraph-function 'rust-fill-paragraph))
-                  fill-paragraph-function))
-             (fill-paragraph-handle-comment t))
+                  fill-paragraph-function)))
           (apply 'fill-paragraph args)
           t))))))
 

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

@@ -200,7 +200,7 @@ impl<'self> FromBase64 for &'self str {
                 '0'..'9' => buf |= val + 0x04,
                 '+'|'-' => buf |= 0x3E,
                 '/'|'_' => buf |= 0x3F,
-                '\r'|'\n' => continue,
+                '\r'|'\n' => loop,
                 '=' => break,
                 _ => return Err(format!("Invalid character '{}' at position {}",
                                      self.char_at(idx), idx))

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

@@ -303,7 +303,7 @@ impl io::Reader for FileInput {
                     let b = r.read_byte();
 
                     if b < 0 {
-                        continue;
+                        loop;
                     }
 
                     if b == '\n' as int {

branches/dist-snap/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/dist-snap/src/libextra/glob.rs

@@ -211,7 +211,7 @@ impl Pattern {
                                 let cs = parse_char_specifiers(chars.slice(i + 2, i + 3 + j));
                                 tokens.push(AnyExcept(cs));
                                 i += j + 4;
-                                continue;
+                                loop;
                             }
                         }
                     }
@@ -222,7 +222,7 @@ impl Pattern {
                                 let cs = parse_char_specifiers(chars.slice(i + 1, i + 2 + j));
                                 tokens.push(AnyWithin(cs));
                                 i += j + 3;
-                                continue;
+                                loop;
                             }
                         }
                     }

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

@@ -100,7 +100,7 @@ impl<'self> FromHex for &'self str {
                 '0'..'9' => buf |= byte - ('0' as u8),
                 ' '|'\r'|'\n'|'\t' => {
                     buf >>= 4;
-                    continue
+                    loop
                 }
                 _ => return Err(format!("Invalid character '{}' at position {}",
                                         self.char_at(idx), idx))

branches/dist-snap/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/dist-snap/src/libextra/num/bigint.rs

@@ -413,7 +413,7 @@ impl Integer for BigUint {
                 }
                 if d0.is_zero() {
                     n = 2;
-                    continue;
+                    loop;
                 }
                 n = 1;
                 // FIXME(#6102): Assignment operator for BigInt causes ICE

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

@@ -140,7 +140,7 @@ impl<T:Ord> PriorityQueue<T> {
                     let x = replace(&mut self.data[parent], init());
                     move_val_init(&mut self.data[pos], x);
                     pos = parent;
-                    continue
+                    loop
                 }
                 break
             }

branches/dist-snap/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/dist-snap/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/dist-snap/src/libextra/terminfo/parser/compiled.rs

@@ -276,7 +276,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> {
         for (i, v) in string_offsets.iter().enumerate() {
             let offset = *v;
             if offset == 0xFFFF { // non-entry
-                continue;
+                loop;
             }
 
             let name = if snames[i] == "_" {
@@ -289,7 +289,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> {
                 // undocumented: FFFE indicates cap@, which means the capability is not present
                 // unsure if the handling for this is correct
                 string_map.insert(name.to_owned(), ~[]);
-                continue;
+                loop;
             }
 
 

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");

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

@@ -359,12 +359,12 @@ pub fn query_to_str(query: &Query) -> ~str {
 pub fn get_scheme(rawurl: &str) -> Result<(~str, ~str), ~str> {
     for (i,c) in rawurl.iter().enumerate() {
         match c {
-          'A' .. 'Z' | 'a' .. 'z' => continue,
+          'A' .. 'Z' | 'a' .. 'z' => loop,
           '0' .. '9' | '+' | '-' | '.' => {
             if i == 0 {
                 return Err(~"url: Scheme must begin with a letter.");
             }
-            continue;
+            loop;
           }
           ':' => {
             if i == 0 {
@@ -420,7 +420,7 @@ fn get_authority(rawurl: &str) ->
     let mut end = len;
 
     for (i,c) in rawurl.iter().enumerate() {
-        if i < 2 { continue; } // ignore the leading //
+        if i < 2 { loop; } // ignore the leading //
 
         // deal with input class first
         match c {
@@ -558,7 +558,7 @@ fn get_path(rawurl: &str, authority: bool) ->
           'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '&' |'\'' | '(' | ')' | '.'
           | '@' | ':' | '%' | '/' | '+' | '!' | '*' | ',' | ';' | '='
           | '_' | '-' => {
-            continue;
+            loop;
           }
           '?' | '#' => {
             end = i;

branches/dist-snap/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/dist-snap/src/librust/rust.rs

@@ -247,7 +247,7 @@ pub fn main() {
                     os::set_exit_status(exit_code);
                     return;
                 }
-                _ => {}
+                _ => loop
             }
         }
     }

branches/dist-snap/src/librustc/back/link.rs

@@ -1004,7 +1004,7 @@ pub fn link_args(sess: Session,
     for cratepath in r.iter() {
         if cratepath.filetype() == Some(".rlib") {
             args.push(cratepath.to_str());
-            continue;
+            loop;
         }
         let dir = cratepath.dirname();
         if dir != ~"" { args.push(~"-L" + dir); }

branches/dist-snap/src/librustc/lib/llvm.rs

@@ -11,7 +11,6 @@
 // LLVM wrappers are intended to be called from trans,
 // which already runs in a #[fixed_stack_segment]
 #[allow(cstack)];
-#[allow(non_uppercase_pattern_statics)];
 
 use std::c_str::ToCStr;
 use std::hashmap::HashMap;

branches/dist-snap/src/librustc/middle/borrowck/check_loans.rs

@@ -263,8 +263,8 @@ impl<'self> CheckLoanCtxt<'self> {
         debug2!("illegal_if={:?}", illegal_if);
 
         for restr in loan1.restrictions.iter() {
-            if !restr.set.intersects(illegal_if) { continue; }
-            if restr.loan_path != loan2.loan_path { continue; }
+            if !restr.set.intersects(illegal_if) { loop; }
+            if restr.loan_path != loan2.loan_path { loop; }
 
             match (new_loan.mutbl, old_loan.mutbl) {
                 (MutableMutability, MutableMutability) => {