diff --git a/src/libextra/base64.rs b/src/libextra/base64.rs index ed366047c848ba1b06da90a4f828ce3c213d9666..2b18c27f560e11c896001e83fd9a734b926c0687 100644 --- a/src/libextra/base64.rs +++ b/src/libextra/base64.rs @@ -200,7 +200,7 @@ fn from_base64(&self) -> Result<~[u8], ~str> { '0'..'9' => buf |= val + 0x04, '+'|'-' => buf |= 0x3E, '/'|'_' => buf |= 0x3F, - '\r'|'\n' => loop, + '\r'|'\n' => continue, '=' => break, _ => return Err(format!("Invalid character '{}' at position {}", self.char_at(idx), idx)) diff --git a/src/libextra/fileinput.rs b/src/libextra/fileinput.rs index 37bcb447f082eaec62858d8dfc24cf88a9167796..e85b715b21a8486178b2a6e00d804e91e84b5d3a 100644 --- a/src/libextra/fileinput.rs +++ b/src/libextra/fileinput.rs @@ -303,7 +303,7 @@ fn read_byte(&self) -> int { let b = r.read_byte(); if b < 0 { - loop; + continue; } if b == '\n' as int { diff --git a/src/libextra/glob.rs b/src/libextra/glob.rs index 9af2f1acc693138d431a3a52ab81f4c57fe003a5..112ea14218933144824012ca5656160d270bf9a4 100644 --- a/src/libextra/glob.rs +++ b/src/libextra/glob.rs @@ -211,7 +211,7 @@ pub fn new(pattern: &str) -> Pattern { let cs = parse_char_specifiers(chars.slice(i + 2, i + 3 + j)); tokens.push(AnyExcept(cs)); i += j + 4; - loop; + continue; } } } @@ -222,7 +222,7 @@ pub fn new(pattern: &str) -> Pattern { let cs = parse_char_specifiers(chars.slice(i + 1, i + 2 + j)); tokens.push(AnyWithin(cs)); i += j + 3; - loop; + continue; } } } diff --git a/src/libextra/hex.rs b/src/libextra/hex.rs index 709b4a95981f2c6f72dde1ddd64676665090933b..d6e0d8f99c2b34743cd46b310387c7b45e34dbfb 100644 --- a/src/libextra/hex.rs +++ b/src/libextra/hex.rs @@ -100,7 +100,7 @@ fn from_hex(&self) -> Result<~[u8], ~str> { '0'..'9' => buf |= byte - ('0' as u8), ' '|'\r'|'\n'|'\t' => { buf >>= 4; - loop + continue } _ => return Err(format!("Invalid character '{}' at position {}", self.char_at(idx), idx)) diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs index 2ec9c7471799f76a3abe59812e679e37b8cb133a..48fcd972c3c831704448985ac109984c0832f150 100644 --- a/src/libextra/num/bigint.rs +++ b/src/libextra/num/bigint.rs @@ -413,7 +413,7 @@ fn div_mod_floor_inner(a: BigUint, b: BigUint) -> (BigUint, BigUint) { } if d0.is_zero() { n = 2; - loop; + continue; } n = 1; // FIXME(#6102): Assignment operator for BigInt causes ICE diff --git a/src/libextra/priority_queue.rs b/src/libextra/priority_queue.rs index 6dd4759d92778c8b1e58940bedd5191aae1d44ad..587f83720877d23ab1184d4c447c21a7321d643e 100644 --- a/src/libextra/priority_queue.rs +++ b/src/libextra/priority_queue.rs @@ -140,7 +140,7 @@ fn siftup(&mut self, start: uint, mut pos: uint) { let x = replace(&mut self.data[parent], init()); move_val_init(&mut self.data[pos], x); pos = parent; - loop + continue } break } diff --git a/src/libextra/terminfo/parser/compiled.rs b/src/libextra/terminfo/parser/compiled.rs index caef3e70ce80ab1528dee96eba5fce2537d64332..0adf86ed931595d8e73284ccf5648e74c7594e51 100644 --- a/src/libextra/terminfo/parser/compiled.rs +++ b/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 - loop; + continue; } 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(), ~[]); - loop; + continue; } diff --git a/src/libextra/url.rs b/src/libextra/url.rs index 7a10c0439daf4975dec8402d7413a6b256b1485d..2afc49df43a6c66d2651e450155fbbe6e5462d6e 100644 --- a/src/libextra/url.rs +++ b/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' => loop, + 'A' .. 'Z' | 'a' .. 'z' => continue, '0' .. '9' | '+' | '-' | '.' => { if i == 0 { return Err(~"url: Scheme must begin with a letter."); } - loop; + continue; } ':' => { if i == 0 { @@ -420,7 +420,7 @@ enum State { let mut end = len; for (i,c) in rawurl.iter().enumerate() { - if i < 2 { loop; } // ignore the leading // + if i < 2 { continue; } // 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' | '&' |'\'' | '(' | ')' | '.' | '@' | ':' | '%' | '/' | '+' | '!' | '*' | ',' | ';' | '=' | '_' | '-' => { - loop; + continue; } '?' | '#' => { end = i; diff --git a/src/librust/rust.rs b/src/librust/rust.rs index 0b4d07a6ebfd36ece20e36444f2f92aed0c6c25a..cdd71fc3d09e5e46019445c52d82402322902d8c 100644 --- a/src/librust/rust.rs +++ b/src/librust/rust.rs @@ -247,7 +247,7 @@ pub fn main() { os::set_exit_status(exit_code); return; } - _ => loop + _ => {} } } } diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index ca2e1cbde7b8188a19176a524b7b7ca58c08e13b..4106d2365b53b775f683ff33d1800e724c8a7bae 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -1004,7 +1004,7 @@ fn unlib(config: @session::config, stem: ~str) -> ~str { for cratepath in r.iter() { if cratepath.filetype() == Some(".rlib") { args.push(cratepath.to_str()); - loop; + continue; } let dir = cratepath.dirname(); if dir != ~"" { args.push(~"-L" + dir); } diff --git a/src/librustc/middle/borrowck/check_loans.rs b/src/librustc/middle/borrowck/check_loans.rs index 5334bf7cc1de4cc0e59d640c07f75a957daaa752..73c77cdddd9d350b4722f654dd66c14a710ada3e 100644 --- a/src/librustc/middle/borrowck/check_loans.rs +++ b/src/librustc/middle/borrowck/check_loans.rs @@ -263,8 +263,8 @@ pub fn report_error_if_loan_conflicts_with_restriction(&self, debug2!("illegal_if={:?}", illegal_if); for restr in loan1.restrictions.iter() { - if !restr.set.intersects(illegal_if) { loop; } - if restr.loan_path != loan2.loan_path { loop; } + if !restr.set.intersects(illegal_if) { continue; } + if restr.loan_path != loan2.loan_path { continue; } match (new_loan.mutbl, old_loan.mutbl) { (MutableMutability, MutableMutability) => { diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs index 591ca2ada5a12c65d56f40beb218413a8fbb424d..4f0993082189db07d9623dfbc6b1caf68a7c6983 100644 --- a/src/librustc/middle/lint.rs +++ b/src/librustc/middle/lint.rs @@ -613,7 +613,7 @@ pub fn each_lint(sess: session::Session, ast::MetaList(_, ref metas) => metas, _ => { sess.span_err(meta.span, "malformed lint attribute"); - loop; + continue; } }; for meta in metas.iter() { diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs index 8b2e581836bd817171cf947e35c3755d3dffea13..7088091e1928c3e7dfd55119ef779a0c52d313cf 100644 --- a/src/librustc/middle/privacy.rs +++ b/src/librustc/middle/privacy.rs @@ -225,7 +225,7 @@ fn local_item_is_private(&mut self, span: Span, item_id: NodeId) -> bool { fn check_field(&mut self, span: Span, id: ast::DefId, ident: ast::Ident) { let fields = ty::lookup_struct_fields(self.tcx, id); for field in fields.iter() { - if field.name != ident.name { loop; } + if field.name != ident.name { continue; } if field.vis == private { self.tcx.sess.span_err(span, format!("field `{}` is private", token::ident_to_str(&ident))); diff --git a/src/librustc/middle/reachable.rs b/src/librustc/middle/reachable.rs index 6973b46c92c47c58d79e4d5898520392efe0c406..796855434505c98ffb4f3cfa4f5e9c315a9063f5 100644 --- a/src/librustc/middle/reachable.rs +++ b/src/librustc/middle/reachable.rs @@ -359,7 +359,7 @@ fn propagate(&self) { while self.worklist.len() > 0 { let search_item = self.worklist.pop(); if scanned.contains(&search_item) { - loop + continue } scanned.insert(search_item); self.reachable_symbols.insert(search_item); diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 4b5141f1630e0f7f440ad60984c942c3711d29a5..4ad9371e2bee24691812d234886a6a9f8c857055 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -3334,7 +3334,7 @@ pub fn add_exports_for_module(&mut self, if importresolution.privacy != Public { debug2!("(computing exports) not reexporting private `{}`", interner_get(*name)); - loop; + continue; } let xs = [TypeNS, ValueNS]; for ns in xs.iter() { diff --git a/src/librustc/middle/trans/cabi_x86_64.rs b/src/librustc/middle/trans/cabi_x86_64.rs index 9f098fe3cc116ffab71e886cb3d2e41738588106..40a09e3507cda0443c82f1ef0a34e68c930194d1 100644 --- a/src/librustc/middle/trans/cabi_x86_64.rs +++ b/src/librustc/middle/trans/cabi_x86_64.rs @@ -317,7 +317,7 @@ fn llvec_len(cls: &[RegClass]) -> uint { let vec_ty = Type::vector(&Type::f32(), (vec_len * 2u) as u64); tys.push(vec_ty); i += vec_len; - loop; + continue; } SSEFs => { tys.push(Type::f32()); diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs index 91bb4df301707c5764b5b70c51f8c5f677b3b3a7..7a88b93cd37faac5c3ed0ef59f5518784173dcd3 100644 --- a/src/librustc/middle/typeck/astconv.rs +++ b/src/librustc/middle/typeck/astconv.rs @@ -799,7 +799,7 @@ fn conv_builtin_bounds(tcx: ty::ctxt, ast_bounds: &Option { if ty::try_add_builtin_trait(tcx, trait_did, &mut builtin_bounds) { - loop; // success + continue; // success } } _ => { } diff --git a/src/librustc/middle/typeck/check/_match.rs b/src/librustc/middle/typeck/check/_match.rs index f022f2b3c4bce1c429fb30079450a16dc00948eb..cd681a3dcf9f2070a7acea0ec7db1392fbcb5a22 100644 --- a/src/librustc/middle/typeck/check/_match.rs +++ b/src/librustc/middle/typeck/check/_match.rs @@ -330,7 +330,7 @@ pub fn check_struct_pat_fields(pcx: &pat_ctxt, if !etc { for (i, field) in class_fields.iter().enumerate() { if found_fields.contains(&i) { - loop; + continue; } tcx.sess.span_err(span, format!("pattern does not mention field `{}`", diff --git a/src/librustc/middle/typeck/check/method.rs b/src/librustc/middle/typeck/check/method.rs index a4538c961fd6d1e611b4358b5bc3edf85071bf61..8bfef838c9c99ef4c1c5301ca773ebc76ee2f0a0 100644 --- a/src/librustc/middle/typeck/check/method.rs +++ b/src/librustc/middle/typeck/check/method.rs @@ -922,7 +922,7 @@ fn merge_candidates(&self, candidates: &[Candidate]) -> ~[Candidate] { if skip { // There are more than one of these and we need only one - loop; + continue; } else { merged.push(candidate_a.clone()); } diff --git a/src/librustc/middle/typeck/check/vtable.rs b/src/librustc/middle/typeck/check/vtable.rs index 146be8b85ad97584c36321c1938ccbbf87a835aa..074603fb7a0a91580c60eafed7c1438b950d97a1 100644 --- a/src/librustc/middle/typeck/check/vtable.rs +++ b/src/librustc/middle/typeck/check/vtable.rs @@ -338,7 +338,7 @@ fn search_for_vtable(vcx: &VtableContext, // First, ensure we haven't processed this impl yet. if impls_seen.contains(&im.did) { - loop; + continue; } impls_seen.insert(im.did); @@ -349,7 +349,7 @@ fn search_for_vtable(vcx: &VtableContext, // get all the ty vars sorted out. let r = ty::impl_trait_ref(tcx, im.did); let of_trait_ref = r.expect("trait_ref missing on trait impl"); - if of_trait_ref.def_id != trait_ref.def_id { loop; } + if of_trait_ref.def_id != trait_ref.def_id { continue; } // At this point, we know that of_trait_ref is the same trait // as trait_ref, but possibly applied to different substs. @@ -377,7 +377,7 @@ fn search_for_vtable(vcx: &VtableContext, location_info.span), ty, for_ty) { - result::Err(_) => loop, + result::Err(_) => continue, result::Ok(()) => () } diff --git a/src/librustc/middle/typeck/coherence.rs b/src/librustc/middle/typeck/coherence.rs index f6c24e3cd231a494ab0259747705cf87984583bc..9ad8377cdd177b19717e75186712013a2234a03a 100644 --- a/src/librustc/middle/typeck/coherence.rs +++ b/src/librustc/middle/typeck/coherence.rs @@ -558,7 +558,7 @@ pub fn check_trait_methods_are_implemented( let r = ty::trait_methods(tcx, trait_did); for method in r.iter() { debug2!("checking for {}", method.ident.repr(tcx)); - if provided_names.contains(&method.ident.name) { loop; } + if provided_names.contains(&method.ident.name) { continue; } tcx.sess.span_err(trait_ref_span, format!("missing method `{}`", @@ -730,7 +730,7 @@ pub fn populate_destructor_table(&self) { for impl_info in impls.iter() { if impl_info.methods.len() < 1 { // We'll error out later. For now, just don't ICE. - loop; + continue; } let method_def_id = impl_info.methods[0].def_id; diff --git a/src/librustc/middle/typeck/infer/region_inference/mod.rs b/src/librustc/middle/typeck/infer/region_inference/mod.rs index e5492453b98e2ffd201b7f3ef765011100853117..3ab7ced39416c518f505690eba4ba1e124e40b1d 100644 --- a/src/librustc/middle/typeck/infer/region_inference/mod.rs +++ b/src/librustc/middle/typeck/infer/region_inference/mod.rs @@ -919,7 +919,7 @@ fn collect_concrete_region_errors( ConstrainVarSubVar(*) | ConstrainRegSubVar(*) | ConstrainVarSubReg(*) => { - loop; + continue; } ConstrainRegSubReg(sub, sup) => { (sub, sup) @@ -927,7 +927,7 @@ fn collect_concrete_region_errors( }; if self.is_subregion_of(sub, sup) { - loop; + continue; } debug2!("ConcreteFailure: !(sub <= sup): sub={:?}, sup={:?}", diff --git a/src/librustc/middle/typeck/infer/sub.rs b/src/librustc/middle/typeck/infer/sub.rs index ad251a5be9e9597a7946269635f31bc531f478bb..2a2d7fbcfc74614809cd3d571cda7ef4d7a56f91 100644 --- a/src/librustc/middle/typeck/infer/sub.rs +++ b/src/librustc/middle/typeck/infer/sub.rs @@ -199,10 +199,10 @@ fn fn_sigs(&self, a: &ty::FnSig, b: &ty::FnSig) -> cres { // or new variables: match *tainted_region { ty::re_infer(ty::ReVar(ref vid)) => { - if new_vars.iter().any(|x| x == vid) { loop; } + if new_vars.iter().any(|x| x == vid) { continue; } } _ => { - if *tainted_region == skol { loop; } + if *tainted_region == skol { continue; } } }; diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 1dde7bd80d451b607275f82749a0ddb1076ba2aa..b7ee60b9f54740d8fac69afdfb65116c6063ec19 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -225,7 +225,7 @@ fn clean_srcpath(src: &str, f: &fn(&str)) { let p = Path(src); for c in p.components.iter() { if "." == *c { - loop + continue } if ".." == *c { f("up"); @@ -928,7 +928,7 @@ fn fmt(s: &Initializer<'self>, f: &mut fmt::Formatter) { } _ => { - if myitem.name.is_none() { loop } + if myitem.name.is_none() { continue } write!(w, " ) { match meth.doc_value() { Some(s) => { write!(w, "
{}
", Markdown(s)); - loop + continue } None => {} } // No documentation? Attempt to slurp in the trait's documentation let trait_id = match trait_id { - None => loop, - Some(id) if is_local(id) => loop, + None => continue, + Some(id) if is_local(id) => continue, Some(id) => id.node, }; do local_data::get(cache_key) |cache| { @@ -1369,7 +1369,7 @@ fn build_sidebar(m: &clean::Module) -> HashMap<~str, ~[~str]> { for item in m.items.iter() { let short = shortty(item); let myname = match item.name { - None => loop, + None => continue, Some(ref s) => s.to_owned(), }; let v = map.find_or_insert_with(short.to_owned(), |_| ~[]); diff --git a/src/librustdoc/rustdoc.rs b/src/librustdoc/rustdoc.rs index a7eac9f268d3c70003601b3b09f00453b17a1e33..b953fe1ed5d8e292287e9f57c6ba0ae5e821b0b3 100644 --- a/src/librustdoc/rustdoc.rs +++ b/src/librustdoc/rustdoc.rs @@ -234,7 +234,7 @@ fn rust_input(cratefile: &str, matches: &getopts::Matches) -> Output { Some(i) => PASSES[i].n1(), None => { error2!("unknown pass {}, skipping", *pass); - loop + continue }, }; pm.add_plugin(plugin); diff --git a/src/librusti/rusti.rs b/src/librusti/rusti.rs index a3185ee943872d48047b5a7b7d0eb27815a2653c..9da8c58fd058c97a62313f8ec3e4409d6a691693 100644 --- a/src/librusti/rusti.rs +++ b/src/librusti/rusti.rs @@ -569,7 +569,7 @@ pub fn main_args(args: &[~str]) -> int { if istty { println("()"); } - loop; + continue; } run_line(&mut repl, input, out, line, istty); } diff --git a/src/librustpkg/path_util.rs b/src/librustpkg/path_util.rs index 9a440cb5f8ff097627f21499f477c5397ad6fa75..5b701bcb660eef50a42b1d8fb8c894e8bd153924 100644 --- a/src/librustpkg/path_util.rs +++ b/src/librustpkg/path_util.rs @@ -233,7 +233,7 @@ fn library_in(short_name: &str, version: &Version, dir_to_search: &Path) -> Opti // Find a filename that matches the pattern: (lib_prefix)-hash-(version)(lib_suffix) // and remember what the hash was let mut f_name = match p_path.filestem() { - Some(s) => s, None => loop + Some(s) => s, None => continue }; // Already checked the filetype above diff --git a/src/librustpkg/version.rs b/src/librustpkg/version.rs index a59d2bb28870cad01b62bd98b1f28fcc11c093d5..12226b77eea5bda9ad690fb43e6d9a02b0c592c0 100644 --- a/src/librustpkg/version.rs +++ b/src/librustpkg/version.rs @@ -101,7 +101,7 @@ pub fn try_getting_local_version(local_path: &Path) -> Option { let local_path = rp.push_rel(local_path); let git_dir = local_path.push(".git"); if !os::path_is_dir(&git_dir) { - loop; + continue; } let outp = run::process_output("git", [format!("--git-dir={}", git_dir.to_str()), ~"tag", ~"-l"]); @@ -109,7 +109,7 @@ pub fn try_getting_local_version(local_path: &Path) -> Option { debug2!("git --git-dir={} tag -l ~~~> {:?}", git_dir.to_str(), outp.status); if outp.status != 0 { - loop; + continue; } let mut output = None; diff --git a/src/libstd/io.rs b/src/libstd/io.rs index dfe517932fcf65048d3b4aa0185cc32588519751..2dfd41a4435e00c486359e752a323a592ef160c4 100644 --- a/src/libstd/io.rs +++ b/src/libstd/io.rs @@ -665,7 +665,7 @@ fn chars_from_utf8(bytes: &~[u8], chars: &mut ~[char]) unsafe { chars.push(transmute(b0 as u32)); } - loop; + continue; } // can't satisfy this char with the existing data if end > bytes_len { diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs index f1e0eff5616c930021444df95ab14ef7bb72eadf..215f11980a13e92b746cbe9381f9043e01aa2b57 100644 --- a/src/libstd/iter.rs +++ b/src/libstd/iter.rs @@ -1150,7 +1150,7 @@ fn next(&mut self) -> Option { if (self.predicate)(&x) { return Some(x); } else { - loop + continue } } None @@ -1173,7 +1173,7 @@ fn next_back(&mut self) -> Option { if (self.predicate)(&x) { return Some(x); } else { - loop + continue } } } @@ -1342,7 +1342,7 @@ fn next(&mut self) -> Option { Some(x) => { if (self.predicate)(&x) { next = self.iter.next(); - loop + continue } else { self.flag = true; return Some(x) @@ -1415,7 +1415,7 @@ fn next(&mut self) -> Option { match next { Some(_) => { next = self.iter.next(); - loop + continue } None => { self.n = 0; diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index 19e6a2dd0ef6b92d3059496e1393109ec25a99a4..32a6d3cd4a79c264ccf20bf6a5997e011806deb7 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -355,7 +355,7 @@ pub fn float_to_str_bytes_common(&'a self) -> &'a [~str] { self.components.as_slice() } pub fn normalize(components: &[~str]) -> ~[~str] { let mut cs = ~[]; for c in components.iter() { - if *c == ~"." && components.len() > 1 { loop; } - if *c == ~"" { loop; } + if *c == ~"." && components.len() > 1 { continue; } + if *c == ~"" { continue; } if *c == ~".." && cs.len() != 0 { cs.pop(); - loop; + continue; } cs.push((*c).clone()); } diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index cc0e843b8965083c304ae13f58fc84115782efdd..5fa0281dc93720b3af9f5a4e8d281c90a9b308f6 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -543,7 +543,7 @@ fn sample>(&mut self, iter: T, n: uint) -> ~[A] { for (i, elem) in iter.enumerate() { if i < n { reservoir.push(elem); - loop + continue } let k = self.gen_integer_range(0, i + 1); diff --git a/src/libstd/rt/logging.rs b/src/libstd/rt/logging.rs index 51eb2505f550c3e8348ed1295adb4baa5ad9f8d7..299aa1175a74c4766acc8a0f9b47478bf78634f4 100644 --- a/src/libstd/rt/logging.rs +++ b/src/libstd/rt/logging.rs @@ -92,14 +92,14 @@ fn parse_logging_spec(spec: ~str) -> ~[LogDirective]{ _ => { dumb_println(format!("warning: invalid logging spec \ '{}', ignoring it", parts[1])); - loop; + continue; } } }, _ => { dumb_println(format!("warning: invalid logging spec '{}',\ ignoring it", s)); - loop; + continue; } } let dir = LogDirective {name: name, level: log_level}; diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index f93fc1e81da23065d13b8d1e1bba79b9e748d20d..f0e64b1830e1abbdf600ba868321dc4e4e2439c7 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -1057,12 +1057,12 @@ fn refold_test_sc(mut sc: SyntaxContext, table : &SCTable) -> ~[TestSC] { Mark(mrk,tail) => { result.push(M(mrk)); sc = tail; - loop; + continue; }, Rename(id,name,tail) => { result.push(R(id,name)); sc = tail; - loop; + continue; } IllegalCtxt => fail2!("expected resolvable context, got IllegalCtxt") } diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 31905f6ccc7aa9e957d9eec4a44be42cb8d58a25..df31fece5eaee94a01d7b6701475042fec1eb11d 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -340,7 +340,7 @@ pub fn find_stability>(mut metas: It) -> O "stable" => Stable, "frozen" => Frozen, "locked" => Locked, - _ => loop // not a stability level + _ => continue // not a stability level }; return Some(Stability { diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 11d9713af98f8bcbf075dfe8a34d9b5c4877658a..8d327de6d611121181d62eb37aae58574dd128fb 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -108,7 +108,7 @@ fn parse_args(&mut self, sp: Span, named `{}`", name)); self.ecx.parse_sess.span_diagnostic.span_note( prev.span, "previously here"); - loop + continue } } self.names.insert(name, e); @@ -592,7 +592,7 @@ fn to_expr(&self, extra: @ast::Expr) -> @ast::Expr { // of each variable because we don't want to move out of the arguments // passed to this function. for (i, &e) in self.args.iter().enumerate() { - if self.arg_types[i].is_none() { loop } // error already generated + if self.arg_types[i].is_none() { continue } // error already generated let name = self.ecx.ident_of(format!("__arg{}", i)); let e = self.ecx.expr_addr_of(e.span, e); @@ -601,7 +601,7 @@ fn to_expr(&self, extra: @ast::Expr) -> @ast::Expr { self.ecx.expr_ident(e.span, name))); } for (&name, &e) in self.names.iter() { - if !self.name_types.contains_key(&name) { loop } + if !self.name_types.contains_key(&name) { continue } let lname = self.ecx.ident_of(format!("__arg{}", name)); let e = self.ecx.expr_addr_of(e.span, e); diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index 640c7c220e5e294b090c043c70f5b7586e385aa8..3689b5c49995225f7444b571d8098a7616bc855f 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -431,7 +431,7 @@ fn scan_digits(rdr: @mut StringReader, radix: uint) -> ~str { let mut rslt = ~""; loop { let c = rdr.curr; - if c == '_' { bump(rdr); loop; } + if c == '_' { bump(rdr); continue; } match char::to_digit(c, radix) { Some(_) => { rslt.push_char(c); diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 5c88c61795087c867df786d6efb6fa0c14576a46..4598bc043691c806bceb65f8b5c368311293bf7b 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1987,7 +1987,7 @@ pub fn parse_dot_or_call_expr_with(&self, e0: @Expr) -> @Expr { } _ => self.unexpected() } - loop; + continue; } if self.expr_is_complete(e) { break; } match *self.token { diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index bc1a47212074271e7211f46a70afff8c8a23b912..2a3add059ce33c181f93b0a3603d936f6052fcd0 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1406,7 +1406,7 @@ fn print_field(s: @ps, field: &ast::Field) { } } ast::ExprAgain(opt_ident) => { - word(s.s, "loop"); + word(s.s, "continue"); space(s.s); for ident in opt_ident.iter() { word(s.s, "'"); diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 4c246bbe3f70695ccb02635d214cebfe2ac37098..f7ed87f7a4fcfeb96b7f1d360e245818d04fa990 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -196,7 +196,7 @@ fn main() { while !rdr.eof() { let line: ~str = rdr.read_line(); - if line.len() == 0u { loop; } + if line.len() == 0u { continue; } match (line[0] as char, proc_mode) { diff --git a/src/test/bench/shootout-reverse-complement.rs b/src/test/bench/shootout-reverse-complement.rs index 6ce62ccd1271453e82faaf46031b172321db38c3..d7a7fe00185ba5054fefa4b6be124249831e3fec 100644 --- a/src/test/bench/shootout-reverse-complement.rs +++ b/src/test/bench/shootout-reverse-complement.rs @@ -130,7 +130,7 @@ fn main() { stdout); pos = 0; - loop; + continue; } // Complement other lines. diff --git a/src/test/compile-fail/borrowck-lend-flow-loop.rs b/src/test/compile-fail/borrowck-lend-flow-loop.rs index fff8a25847972b4a3bed9af1dda8774c76356f2f..99112985be674d5a3fa926a4006e2be04e24b622 100644 --- a/src/test/compile-fail/borrowck-lend-flow-loop.rs +++ b/src/test/compile-fail/borrowck-lend-flow-loop.rs @@ -135,7 +135,7 @@ fn loop_loop_pops_scopes<'r>(_v: &'r mut [uint], f: &fn(&'r mut uint) -> bool) { // this borrow is limited to the scope of `r`... let r: &'r mut uint = produce(); if !f(&mut *r) { - loop; // ...so it is not live as exit (and re-enter) the `while` loop here + continue; // ...so it is not live as exit (and re-enter) the `while` loop here } } } diff --git a/src/test/run-pass/break.rs b/src/test/run-pass/break.rs index 5903e421465008af68bce0c980387fbcf318932b..1ae77bc1eca842c4b90d280e0376ca375e00b848 100644 --- a/src/test/run-pass/break.rs +++ b/src/test/run-pass/break.rs @@ -19,15 +19,15 @@ pub fn main() { if *x == 3 { break; } assert!((*x <= 3)); } i = 0; - while i < 10 { i += 1; if i % 2 == 0 { loop; } assert!((i % 2 != 0)); } + while i < 10 { i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0)); } i = 0; loop { - i += 1; if i % 2 == 0 { loop; } assert!((i % 2 != 0)); + i += 1; if i % 2 == 0 { continue; } assert!((i % 2 != 0)); if i >= 10 { break; } } let ys = ~[1, 2, 3, 4, 5, 6]; for x in ys.iter() { - if *x % 2 == 0 { loop; } + if *x % 2 == 0 { continue; } assert!((*x % 2 != 0)); } } diff --git a/src/test/run-pass/foreach-external-iterators-loop.rs b/src/test/run-pass/foreach-external-iterators-loop.rs index ced538e163e801af214d7b8c3813d6c7ce798c00..375768743121999a806845d82cc5318d014f03d9 100644 --- a/src/test/run-pass/foreach-external-iterators-loop.rs +++ b/src/test/run-pass/foreach-external-iterators-loop.rs @@ -13,7 +13,7 @@ pub fn main() { let mut y = 0; for (n,i) in x.iter().enumerate() { if n < 10 { - loop; + continue; } y += *i; } diff --git a/src/test/run-pass/issue-2216.rs b/src/test/run-pass/issue-2216.rs index 4ad7d9500f67465d7da1553650e86705e3309838..f51a49e9c7b93ab21728bbacf1ed3b3dcc4a6035 100644 --- a/src/test/run-pass/issue-2216.rs +++ b/src/test/run-pass/issue-2216.rs @@ -21,7 +21,7 @@ pub fn main() { break 'bar; } } - loop 'foo; + continue 'foo; } x = 42; break; diff --git a/src/test/run-pass/loop-break-cont.rs b/src/test/run-pass/loop-break-cont.rs index 396946ce5a0346beda75f841bd59dc7beb7dd901..812089fd5a570ef0b7bacd939e95f3d4aee95c20 100644 --- a/src/test/run-pass/loop-break-cont.rs +++ b/src/test/run-pass/loop-break-cont.rs @@ -27,7 +27,7 @@ pub fn main() { is_even = false; i += 1u; if i % 2u != 0u { - loop; + continue; } is_even = true; } @@ -40,7 +40,7 @@ pub fn main() { is_even = false; i += 1u; if i % 2u != 0u { - loop; + continue; } is_even = true; } diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs index a2ba9e69bedb730df8c5e1ccb66641125286ebba..37cbc2b40de16386dec7c91a253d2313ed293113 100644 --- a/src/test/run-pass/terminate-in-initializer.rs +++ b/src/test/run-pass/terminate-in-initializer.rs @@ -17,7 +17,7 @@ fn test_break() { loop { let _x: @int = break; } } -fn test_cont() { let mut i = 0; while i < 1 { i += 1; let _x: @int = loop; } } +fn test_cont() { let mut i = 0; while i < 1 { i += 1; let _x: @int = continue; } } fn test_ret() { let _x: @int = return; } diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/run-pass/weird-exprs.rs index 16070049151b5ac46c199d0582712d753e7220fd..9de4e29529466bd47a68deab34f4e34fe0fbcd71 100644 --- a/src/test/run-pass/weird-exprs.rs +++ b/src/test/run-pass/weird-exprs.rs @@ -67,7 +67,7 @@ fn p() -> bool { true } fn angrydome() { loop { if break { } } let mut i = 0; - loop { i += 1; if i == 1 { match (loop) { 1 => { }, _ => fail2!("wat") } } + loop { i += 1; if i == 1 { match (continue) { 1 => { }, _ => fail2!("wat") } } break; } }