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

10 files changed, 18 insertions, 18 deletions

diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs
index 2ef5fb17dd8..0d399bd6303 100644
--- a/src/rustc/back/link.rs
+++ b/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);
diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs
index 1e50f1168c7..f68995db14b 100644
--- a/src/rustc/metadata/encoder.rs
+++ b/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);
         }
diff --git a/src/rustc/middle/borrowck/check_loans.rs b/src/rustc/middle/borrowck/check_loans.rs
index ab1e9b5505e..4b80e934416 100644
--- a/src/rustc/middle/borrowck/check_loans.rs
+++ b/src/rustc/middle/borrowck/check_loans.rs
@@ -247,7 +247,7 @@ impl methods for check_loan_ctxt {
         for self.walk_loans(par_scope_id) |old_loan| {
             for (*new_loanss).each |new_loans| {
                 for (*new_loans).each |new_loan| {
-                    if old_loan.lp != new_loan.lp { cont; }
+                    if old_loan.lp != new_loan.lp { again; }
                     alt (old_loan.mutbl, new_loan.mutbl) {
                       (m_const, _) | (_, m_const) |
                       (m_mutbl, m_mutbl) | (m_imm, m_imm) {
diff --git a/src/rustc/middle/kind.rs b/src/rustc/middle/kind.rs
index f84dd4b0652..b4709820276 100644
--- a/src/rustc/middle/kind.rs
+++ b/src/rustc/middle/kind.rs
@@ -176,7 +176,7 @@ fn check_fn(fk: visit::fn_kind, decl: fn_decl, body: blk, sp: span,
             let id = ast_util::def_id_of_def(fv.def).node;
 
             // skip over free variables that appear in the cap clause
-            if captured_vars.contains(id) { cont; }
+            if captured_vars.contains(id) { again; }
 
             // if this is the last use of the variable, then it will be
             // a move and not a copy
diff --git a/src/rustc/middle/resolve.rs b/src/rustc/middle/resolve.rs
index d8b1f4db640..d1198d86b98 100644
--- a/src/rustc/middle/resolve.rs
+++ b/src/rustc/middle/resolve.rs
@@ -2129,7 +2129,7 @@ fn check_exports(e: @env) {
                 let id = alt check glob.path.node {
                   ast::view_path_glob(_, node_id) { node_id }
                 };
-                if ! glob_is_re_exported.contains_key(id) { cont; }
+                if ! glob_is_re_exported.contains_key(id) { again; }
                 do iter_mod(*e, glob.def,
                             glob.path.span, outside) |ident, def| {
                     vec::push(_mod.globbed_exports, ident);
diff --git a/src/rustc/middle/resolve3.rs b/src/rustc/middle/resolve3.rs
index 69d3a25d5a1..1f6e0f6e127 100644
--- a/src/rustc/middle/resolve3.rs
+++ b/src/rustc/middle/resolve3.rs
@@ -1329,7 +1329,7 @@ class Resolver {
 
         for (*impls_in_module).each |implementation| {
             if def_ids.contains_key(implementation.did) {
-                cont;
+                again;
             }
             def_ids.insert(implementation.did, ());
 
@@ -1821,7 +1821,7 @@ class Resolver {
             if !self.name_is_exported(containing_module, atom) {
                 #debug("(resolving glob import) name '%s' is unexported",
                        *(*self.atom_table).atom_to_str(atom));
-                cont;
+                again;
             }
 
             #debug("(resolving glob import) writing module resolution \
@@ -1898,7 +1898,7 @@ class Resolver {
             if !self.name_is_exported(containing_module, atom) {
                 #debug("(resolving glob import) name '%s' is unexported",
                        *(*self.atom_table).atom_to_str(atom));
-                cont;
+                again;
             }
 
             let mut dest_import_resolution;
@@ -2512,7 +2512,7 @@ class Resolver {
                 // to fail.
 
                 if namespace == ImplNS {
-                    cont;
+                    again;
                 }
 
                 alt self.resolve_definition_of_name_in_module(module,
diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
index 5534140ae72..e987f0f3f13 100644
--- a/src/rustc/middle/trans/base.rs
+++ b/src/rustc/middle/trans/base.rs
@@ -5441,7 +5441,7 @@ fn crate_ctxt_to_encode_parms(cx: @crate_ctxt)
         let mut reexports = ~[];
         for cx.exp_map.each |exp_id, defs| {
             for defs.each |def| {
-                if !def.reexp { cont; }
+                if !def.reexp { again; }
                 let path = alt check cx.tcx.items.get(exp_id) {
                   ast_map::node_export(_, path) {
                     ast_map::path_to_str(*path)
diff --git a/src/rustc/middle/trans/foreign.rs b/src/rustc/middle/trans/foreign.rs
index 39a5215b779..3da69f9b778 100644
--- a/src/rustc/middle/trans/foreign.rs
+++ b/src/rustc/middle/trans/foreign.rs
@@ -301,7 +301,7 @@ fn llreg_ty(cls: ~[x86_64_reg_class]) -> TypeRef {
                                                   vec_len as c_uint);
                 vec::push(tys, vec_ty);
                 i += vec_len;
-                cont;
+                again;
             }
             sse_fs_class {
                 vec::push(tys, T_f32());
diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs
index b91f9778e1c..f1a79fad49b 100644
--- a/src/rustc/middle/typeck/check/method.rs
+++ b/src/rustc/middle/typeck/check/method.rs
@@ -170,7 +170,7 @@ class lookup {
         for vec::each(*bounds) |bound| {
             let (iid, bound_substs) = alt bound {
               ty::bound_copy | ty::bound_send | ty::bound_const {
-                cont; /* ok */
+                again; /* ok */
               }
               ty::bound_trait(bound_t) {
                 alt check ty::get(bound_t).struct {
@@ -215,7 +215,7 @@ class lookup {
 
         let ms = *ty::trait_methods(self.tcx(), did);
         for ms.eachi |i, m| {
-            if m.ident != self.m_name { cont; }
+            if m.ident != self.m_name { again; }
 
             let m_fty = ty::mk_fn(self.tcx(), m.fty);
 
@@ -251,7 +251,7 @@ class lookup {
         let ms = *ty::trait_methods(self.tcx(), did);
 
         for ms.each |m| {
-            if m.ident != self.m_name { cont; }
+            if m.ident != self.m_name { again; }
 
             if m.vis == ast::private && !self.include_private {
                 self.tcx().sess.span_fatal(
diff --git a/src/rustc/middle/typeck/check/vtable.rs b/src/rustc/middle/typeck/check/vtable.rs
index 0c273808001..42d2529415f 100644
--- a/src/rustc/middle/typeck/check/vtable.rs
+++ b/src/rustc/middle/typeck/check/vtable.rs
@@ -119,12 +119,12 @@ fn lookup_vtable(fcx: @fn_ctxt, isc: resolve::iscopes, sp: span,
                 // find the trait that im implements (if any)
                 let of_ty = alt ty::impl_trait(tcx, im.did) {
                   some(of_ty) { of_ty }
-                  _ { cont; }
+                  _ { again; }
                 };
 
                 // it must have the same id as the expected one
                 alt ty::get(of_ty).struct {
-                  ty::ty_trait(id, _) if id != trait_id { cont; }
+                  ty::ty_trait(id, _) if id != trait_id { again; }
                   _ { /* ok */ }
                 }
 
@@ -134,7 +134,7 @@ fn lookup_vtable(fcx: @fn_ctxt, isc: resolve::iscopes, sp: span,
                     impl_self_ty(fcx, im.did);
                 let im_bs = ty::lookup_item_type(tcx, im.did).bounds;
                 alt fcx.mk_subty(ty, for_ty) {
-                  result::err(_) { cont; }
+                  result::err(_) { again; }
                   result::ok(()) { }
                 }