Switch 'cont' to 'again' everywhere. Close #2229.

Author: graydon

src/cargo/cargo.rs

@@ -785,7 +785,7 @@ fn install_source(c: cargo, path: str) {
 
     for cratefiles.each |cf| {
         alt load_crate(cf) {
-            none { cont; }
+            none { again; }
             some(crate) {
               for crate.deps.each |query| {
                     // FIXME (#1356): handle cyclic dependencies
@@ -975,7 +975,7 @@ fn cmd_uninstall(c: cargo) {
                     }
                     ret;
                 }
-                none { cont; }
+                none { again; }
             }
         }
 
@@ -993,7 +993,7 @@ fn cmd_uninstall(c: cargo) {
                     }
                     ret;
                 }
-                none { cont; }
+                none { again; }
             }
         }
         for os::list_dir(bin).each |file| {
@@ -1007,7 +1007,7 @@ fn cmd_uninstall(c: cargo) {
                     }
                     ret;
                 }
-                none { cont; }
+                none { again; }
             }
         }
 

src/fuzzer/fuzzer.rs

@@ -548,18 +548,18 @@ fn check_variants(files: ~[str], cx: context) {
         if cx.mode == tm_converge && file_might_not_converge(file) {
             #error("Skipping convergence test based on\
                     file_might_not_converge");
-            cont;
+            again;
         }
 
         let s = @result::get(io::read_whole_file_str(file));
         if contains(*s, "#") {
-            cont; // Macros are confusing
+            again; // Macros are confusing
         }
         if cx.mode == tm_converge && content_might_not_converge(*s) {
-            cont;
+            again;
         }
         if cx.mode == tm_run && content_is_dangerous_to_compile(*s) {
-            cont;
+            again;
         }
 
         log(error, "check_variants: " + file);

src/libcore/io.rs

@@ -53,7 +53,7 @@ impl reader_util for reader {
                 assert (w > 0u);
                 if w == 1u {
                     vec::push(chars,  b0 as char );
-                    cont;
+                    again;
                 }
                 // can't satisfy this char with the existing data
                 if end > vec::len(buf) {

src/libstd/rope.rs

@@ -1184,7 +1184,7 @@ mod node {
                     let next_char = get_next_char_in_leaf(it);
                     alt(next_char) {
                       option::none {
-                        cont;
+                        again;
                       }
                       option::some(_) {
                         ret next_char;

src/libsyntax/ext/simplext.rs

@@ -767,7 +767,7 @@ fn add_new_extension(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
         for clauses.each |c| {
             alt use_selectors_to_bind(c.params, arg) {
               some(bindings) { ret transcribe(cx, bindings, c.body); }
-              none { cont; }
+              none { again; }
             }
         }
         cx.span_fatal(sp, "no clauses match macro invocation");

src/libsyntax/parse/comments.rs

@@ -56,7 +56,7 @@ fn strip_doc_comment_decoration(comment: str) -> str {
         let mut i = max.get_default(uint::max_value);
         for lines.each |line| {
             if line.trim().is_empty() {
-                cont;
+                again;
             }
             for line.each_chari |j, c| {
                 if j >= i {

src/libsyntax/parse/lexer.rs

@@ -310,7 +310,7 @@ fn scan_digits(rdr: string_reader, radix: uint) -> str {
     let mut rslt = "";
     loop {
         let c = rdr.curr;
-        if c == '_' { bump(rdr); cont; }
+        if c == '_' { bump(rdr); again; }
         alt char::to_digit(c, radix) {
           some(d) {
             str::push_char(rslt, c);

src/libsyntax/parse/parser.rs

@@ -1140,7 +1140,7 @@ class parser {
                   }
                   _ { self.unexpected(); }
                 }
-                cont;
+                again;
             }
             if self.expr_is_complete(e) { break; }
             alt copy self.token {

src/rustc/back/link.rs

@@ -597,7 +597,7 @@ fn link_binary(sess: session,
     for cstore::get_used_crate_files(cstore).each |cratepath| {
         if str::ends_with(cratepath, ".rlib") {
             vec::push(cc_args, cratepath);
-            cont;
+            again;
         }
         let cratepath = cratepath;
         let dir = path::dirname(cratepath);

src/rustc/metadata/encoder.rs

@@ -140,7 +140,7 @@ fn encode_class_item_paths(ebml_w: ebml::writer,
      items: ~[@class_member], path: ~[ident], &index: ~[entry<str>]) {
     for items.each |it| {
      alt ast_util::class_member_visibility(it) {
-          private { cont; }
+          private { again; }
           public {
               let (id, ident) = alt it.node {
                  instance_var(v, _, _, vid, _) { (vid, v) }
@@ -158,7 +158,7 @@ fn encode_module_item_paths(ebml_w: ebml::writer, ecx: @encode_ctxt,
                             &index: ~[entry<str>]) {
     for module.items.each |it| {
         if !reachable(ecx, it.id) ||
-           !ast_util::is_exported(it.ident, module) { cont; }
+           !ast_util::is_exported(it.ident, module) { again; }
         if !ast_util::is_item_impl(it) {
             add_to_index(ebml_w, path, index, it.ident);
         }