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

This commit is contained in:
Graydon Hoare 2012-07-09 14:37:48 -07:00
parent 9afc8be04b
commit c26d02557e
28 changed files with 47 additions and 47 deletions

View file

@ -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) {

View file

@ -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

View file

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

View file

@ -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,

View file

@ -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)

View file

@ -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());

View file

@ -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(

View file

@ -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(()) { }
}