Convert 'again' to 'loop'. Remove 'again' keyword

13 files changed, 19 insertions, 19 deletions

diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs
index 2a9c792da14..5708cf2f785 100644
--- a/src/rustc/back/link.rs
+++ b/src/rustc/back/link.rs
@@ -687,7 +687,7 @@ fn link_binary(sess: session,
     for cstore::get_used_crate_files(cstore).each |cratepath| {
         if cratepath.filetype() == Some(~"rlib") {
             vec::push(cc_args, cratepath.to_str());
-            again;
+            loop;
         }
         let dir = cratepath.dirname();
         if dir != ~"" { vec::push(cc_args, ~"-L" + dir); }
diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs
index f45cd38fe83..41db162b954 100644
--- a/src/rustc/metadata/encoder.rs
+++ b/src/rustc/metadata/encoder.rs
@@ -772,7 +772,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::Writer, item: @item,
         // maybe we should only ever handle the real type signatures.
         for vec::each(ms) |m| {
             let ty_m = ast_util::trait_method_to_ty_method(m);
-            if ty_m.self_ty.node != ast::sty_static { again; }
+            if ty_m.self_ty.node != ast::sty_static { loop; }
 
             vec::push(*index, {val: ty_m.id, pos: ebml_w.writer.tell()});
 
diff --git a/src/rustc/middle/borrowck/check_loans.rs b/src/rustc/middle/borrowck/check_loans.rs
index 0a13ee2ae1e..c45e6d03546 100644
--- a/src/rustc/middle/borrowck/check_loans.rs
+++ b/src/rustc/middle/borrowck/check_loans.rs
@@ -266,7 +266,7 @@ impl 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 { again; }
+                    if old_loan.lp != new_loan.lp { loop; }
                     match (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 68cf5ab354c..6251b321b8e 100644
--- a/src/rustc/middle/kind.rs
+++ b/src/rustc/middle/kind.rs
@@ -199,7 +199,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) { again; }
+            if captured_vars.contains(id) { loop; }
 
             // 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/lang_items.rs b/src/rustc/middle/lang_items.rs
index 2cf26904b0d..084c2e82b3d 100644
--- a/src/rustc/middle/lang_items.rs
+++ b/src/rustc/middle/lang_items.rs
@@ -193,7 +193,7 @@ struct LanguageItemCollector {
                     }
                     dl_def(_) | dl_impl(_) | dl_field => {
                         // Skip this.
-                        again;
+                        loop;
                     }
                 }
 
diff --git a/src/rustc/middle/privacy.rs b/src/rustc/middle/privacy.rs
index 0a2b2fff13d..6f78c884ef0 100644
--- a/src/rustc/middle/privacy.rs
+++ b/src/rustc/middle/privacy.rs
@@ -36,7 +36,7 @@ fn check_crate(tcx: ty::ctxt, method_map: &method_map, crate: @ast::crate) {
     let check_field = |span, id, ident| {
         let fields = ty::lookup_class_fields(tcx, id);
         for fields.each |field| {
-            if field.ident != ident { again; }
+            if field.ident != ident { loop; }
             if field.vis == private {
                 tcx.sess.span_err(span, fmt!("field `%s` is private",
                                              *tcx.sess.parse_sess.interner
diff --git a/src/rustc/middle/resolve.rs b/src/rustc/middle/resolve.rs
index c34881abdfa..18bbb432e39 100644
--- a/src/rustc/middle/resolve.rs
+++ b/src/rustc/middle/resolve.rs
@@ -2156,7 +2156,7 @@ struct Resolver {
             if !self.name_is_exported(containing_module, atom) {
                 debug!("(resolving glob import) name `%s` is unexported",
                        self.session.str_of(atom));
-                again;
+                loop;
             }
 
             debug!("(resolving glob import) writing module resolution \
@@ -2220,7 +2220,7 @@ struct Resolver {
             if !self.name_is_exported(containing_module, atom) {
                 debug!("(resolving glob import) name `%s` is unexported",
                        self.session.str_of(atom));
-                again;
+                loop;
             }
 
             let mut dest_import_resolution;
diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
index 420893f29d4..0b7269e6fb8 100644
--- a/src/rustc/middle/trans/base.rs
+++ b/src/rustc/middle/trans/base.rs
@@ -2537,7 +2537,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 { again; }
+                if !def.reexp { loop; }
                 let path = match cx.tcx.items.get(exp_id) {
                   ast_map::node_export(_, path) => {
                       ast_map::path_to_str(*path, cx.sess.parse_sess.interner)
diff --git a/src/rustc/middle/trans/foreign.rs b/src/rustc/middle/trans/foreign.rs
index c5cb5ee300b..24207d66245 100644
--- a/src/rustc/middle/trans/foreign.rs
+++ b/src/rustc/middle/trans/foreign.rs
@@ -305,7 +305,7 @@ fn llreg_ty(cls: ~[x86_64_reg_class]) -> TypeRef {
                                                   vec_len as c_uint);
                 vec::push(tys, vec_ty);
                 i += vec_len;
-                again;
+                loop;
             }
             sse_fs_class => {
                 vec::push(tys, T_f32());
diff --git a/src/rustc/middle/typeck/check/alt.rs b/src/rustc/middle/typeck/check/alt.rs
index 2d49714d7d2..5aec9bed4d3 100644
--- a/src/rustc/middle/typeck/check/alt.rs
+++ b/src/rustc/middle/typeck/check/alt.rs
@@ -381,7 +381,7 @@ fn check_pat(pcx: pat_ctxt, pat: @ast::pat, expected: ty::t) {
         if !etc {
             for class_fields.eachi |i, field| {
                 if found_fields.contains_key(i) {
-                    again;
+                    loop;
                 }
                 tcx.sess.span_err(pat.span,
                                   fmt!("pattern does not mention field `%s`",
diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs
index 258287e9fe2..a1c5af226bf 100644
--- a/src/rustc/middle/typeck/check/method.rs
+++ b/src/rustc/middle/typeck/check/method.rs
@@ -298,7 +298,7 @@ struct lookup {
             let (trait_id, bound_substs) = match bound {
               ty::bound_copy | ty::bound_send | ty::bound_const |
               ty::bound_owned => {
-                again; /* ok */
+                loop; /* ok */
               }
               ty::bound_trait(bound_t) => {
                 match ty::get(bound_t).struct {
@@ -352,7 +352,7 @@ struct lookup {
 
         let ms = *ty::trait_methods(self.tcx(), did);
         for ms.eachi |i, m| {
-            if m.ident != self.m_name { again; }
+            if m.ident != self.m_name { loop; }
 
             let m_fty = ty::mk_fn(self.tcx(), m.fty);
 
@@ -391,7 +391,7 @@ struct lookup {
         let ms = *ty::trait_methods(self.tcx(), did);
 
         for ms.each |m| {
-            if m.ident != self.m_name { again; }
+            if m.ident != self.m_name { loop; }
 
             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 fa0de2e68db..1a9925c3618 100644
--- a/src/rustc/middle/typeck/check/vtable.rs
+++ b/src/rustc/middle/typeck/check/vtable.rs
@@ -183,7 +183,7 @@ fn lookup_vtable(fcx: @fn_ctxt,
 
                         // First, ensure we haven't processed this impl yet.
                         if impls_seen.contains_key(im.did) {
-                            again;
+                            loop;
                         }
                         impls_seen.insert(im.did, ());
 
@@ -208,7 +208,7 @@ fn lookup_vtable(fcx: @fn_ctxt,
                             match ty::get(of_ty).struct {
                                 ty::ty_trait(id, _, _) => {
                                     // Not the trait we're looking for
-                                    if id != trait_id { again; }
+                                    if id != trait_id { loop; }
                                 }
                                 _ => { /* ok */ }
                             }
@@ -233,7 +233,7 @@ fn lookup_vtable(fcx: @fn_ctxt,
                             let im_bs = ty::lookup_item_type(tcx,
                                                              im.did).bounds;
                             match fcx.mk_subty(false, expr.span, ty, for_ty) {
-                                result::Err(_) => again,
+                                result::Err(_) => loop,
                                 result::Ok(()) => ()
                             }
 
diff --git a/src/rustc/middle/typeck/coherence.rs b/src/rustc/middle/typeck/coherence.rs
index 434a2b1caf2..b6fcb0c385f 100644
--- a/src/rustc/middle/typeck/coherence.rs
+++ b/src/rustc/middle/typeck/coherence.rs
@@ -659,7 +659,7 @@ struct CoherenceChecker {
                 }
                 Some(_) => {
                     // Skip this one.
-                    again;
+                    loop;
                 }
             }
 
@@ -741,7 +741,7 @@ struct CoherenceChecker {
                     }
                     dl_def(_) | dl_impl(_) | dl_field => {
                         // Skip this.
-                        again;
+                        loop;
                     }
                 }