Convert old-style for loops to new-style

Most could use the each method, but because of the hack used to
disambiguate old- and new-style loops, some had to use vec::each.

(This hack will go away soon.)

Issue #1619

Author: marijnh

src/cargo/cargo.rs

@@ -93,7 +93,7 @@ fn load_link(mis: [@ast::meta_item]) -> (option<str>,
     let mut name = none;
     let mut vers = none;
     let mut uuid = none;
-    for a: @ast::meta_item in mis {
+    for mis.each {|a|
         alt a.node {
             ast::meta_name_value(v, {node: ast::lit_str(s), span: _}) {
                 alt v {
@@ -128,7 +128,7 @@ fn load_pkg(filename: str) -> option<pkg> {
     let mut sigs = none;
     let mut crate_type = none;
 
-    for a in c.node.attrs {
+    for c.node.attrs.each {|a|
         alt a.node.value.node {
             ast::meta_name_value(v, {node: ast::lit_str(s), span: _}) {
                 alt v {
@@ -273,7 +273,7 @@ fn load_one_source_package(&src: source, p: map::hashmap<str, json::json>) {
     let mut tags = [];
     alt p.find("tags") {
         some(json::list(js)) {
-            for j in js {
+            for js.each {|j|
                 alt j {
                     json::string(_j) { vec::grow(tags, 1u, _j); }
                     _ { }
@@ -313,7 +313,7 @@ fn load_source_packages(&c: cargo, &src: source) {
     let pkgstr = io::read_whole_file_str(pkgfile);
     alt json::from_str(result::get(pkgstr)) {
         ok(json::list(js)) {
-            for _j: json::json in js {
+            for js.each {|_j|
                 alt _j {
                     json::dict(_p) {
                         load_one_source_package(src, _p);
@@ -423,7 +423,7 @@ fn configure(opts: options) -> cargo {
 
 fn for_each_package(c: cargo, b: fn(source, package)) {
     c.sources.values({ |v|
-        for p in copy v.packages {
+        for vec::each(copy v.packages) {|p|
             b(v, p);
         }
     })
@@ -432,7 +432,7 @@ fn for_each_package(c: cargo, b: fn(source, package)) {
 // Runs all programs in directory <buildpath>
 fn run_programs(buildpath: str) {
     let newv = os::list_dir_path(buildpath);
-    for ct: str in newv {
+    for newv.each {|ct|
         run::run_program(ct, []);
     }
 }
@@ -470,7 +470,7 @@ fn install_one_crate(c: cargo, path: str, cf: str) {
     };
     let newv = os::list_dir_path(buildpath);
     let exec_suffix = os::exe_suffix();
-    for ct: str in newv {
+    for newv.each {|ct|
         if (exec_suffix != "" && str::ends_with(ct, exec_suffix)) ||
             (exec_suffix == "" && !str::starts_with(path::basename(ct),
                                                     "lib")) {
@@ -528,7 +528,7 @@ fn install_source(c: cargo, path: str) {
         fail "This doesn't look like a rust package (no .rc files).";
     }
 
-    for cf: str in cratefiles {
+    for cratefiles.each {|cf|
         let p = load_pkg(cf);
         alt p {
             none { cont; }
@@ -618,7 +618,8 @@ fn install_uuid(c: cargo, wd: str, uuid: str) {
         ret;
     }
     error("Found multiple packages:");
-    for (s,p) in ps {
+    for ps.each {|elt|
+        let (s,p) = elt;
         info("  " + s.name + "/" + p.uuid + " (" + p.name + ")");
     }
 }
@@ -639,7 +640,8 @@ fn install_named(c: cargo, wd: str, name: str) {
         ret;
     }
     error("Found multiple packages:");
-    for (s,p) in ps {
+    for ps.each {|elt|
+        let (s,p) = elt;
         info("  " + s.name + "/" + p.uuid + " (" + p.name + ")");
     }
 }

src/cargo/pgp.rs

@@ -89,10 +89,9 @@ fn verify(root: str, data: str, sig: str, keyfp: str) -> bool {
     let p = gpg(["--homedir", path, "--with-fingerprint", "--verify", sig,
                  data]);
     let res = "Primary key fingerprint: " + keyfp;
-    for line in str::split_char(p.err, '\n') {
-        if line == res {
-            ret true;
-        }
+    let mut rslt = false;
+    for str::split_char(p.err, '\n').each {|line|
+        if line == res { rslt = true; }
     }
-    ret false;
+    ret rslt;
 }

src/compiletest/compiletest.rs

@@ -135,7 +135,7 @@ fn test_opts(config: config) -> test::test_opts {
 fn make_tests(config: config) -> [test::test_desc] {
     #debug("making tests from %s", config.src_base);
     let mut tests = [];
-    for file: str in os::list_dir_path(config.src_base) {
+    for os::list_dir_path(config.src_base).each {|file|
         let file = file;
         #debug("inspecting file %s", file);
         if is_test(config, file) {
@@ -154,11 +154,11 @@ fn is_test(config: config, testfile: str) -> bool {
 
     let mut valid = false;
 
-    for ext in valid_extensions {
+    for valid_extensions.each {|ext|
         if str::ends_with(name, ext) { valid = true; }
     }
 
-    for pre in invalid_prefixes {
+    for invalid_prefixes.each {|pre|
         if str::starts_with(name, pre) { valid = false; }
     }
 

src/compiletest/runtest.rs

@@ -196,7 +196,7 @@ fn check_error_patterns(props: test_props,
 
     let mut next_err_idx = 0u;
     let mut next_err_pat = props.error_patterns[next_err_idx];
-    for line: str in str::split_char(procres.stderr, '\n') {
+    for str::split_char(procres.stderr, '\n').each {|line|
         if str::contains(line, next_err_pat) {
             #debug("found error pattern %s", next_err_pat);
             next_err_idx += 1u;
@@ -215,7 +215,7 @@ fn check_error_patterns(props: test_props,
         fatal_procres(#fmt["error pattern '%s' not found!",
                            missing_patterns[0]], procres);
     } else {
-        for pattern: str in missing_patterns {
+        for missing_patterns.each {|pattern|
             error(#fmt["error pattern '%s' not found!", pattern]);
         }
         fatal_procres("multiple error patterns not found", procres);
@@ -244,7 +244,7 @@ fn check_expected_errors(expected_errors: [errors::expected_error],
     //    filename:line1:col1: line2:col2: *warning:* msg
     // where line1:col1: is the starting point, line2:col2:
     // is the ending point, and * represents ANSI color codes.
-    for line: str in str::split_char(procres.stderr, '\n') {
+    for str::split_char(procres.stderr, '\n').each {|line|
         let mut was_expected = false;
         for vec::eachi(expected_errors) {|i, ee|
             if !found_flags[i] {

src/fuzzer/fuzzer.rs

@@ -25,7 +25,7 @@ fn find_rust_files(&files: [str], path: str) {
     } else if os::path_is_dir(path)
         && !contains(path, "compile-fail")
         && !contains(path, "build") {
-        for p in os::list_dir_path(path) {
+        for os::list_dir_path(path).each {|p|
             find_rust_files(files, p);
         }
     }
@@ -439,15 +439,15 @@ fn content_is_dangerous_to_run(code: str) -> bool {
          "unsafe",
          "log"];    // python --> rust pipe deadlock?
 
-    for p: str in dangerous_patterns { if contains(code, p) { ret true; } }
+    for dangerous_patterns.each {|p| if contains(code, p) { ret true; } }
     ret false;
 }
 
 fn content_is_dangerous_to_compile(code: str) -> bool {
     let dangerous_patterns =
         ["xfail-test"];
 
-    for p: str in dangerous_patterns { if contains(code, p) { ret true; } }
+    for dangerous_patterns.each {|p| if contains(code, p) { ret true; } }
     ret false;
 }
 
@@ -462,7 +462,7 @@ fn content_might_not_converge(code: str) -> bool {
          "\n\n\n\n\n"  // https://github.com/mozilla/rust/issues/850
         ];
 
-    for p: str in confusing_patterns { if contains(code, p) { ret true; } }
+    for confusing_patterns.each {|p| if contains(code, p) { ret true; } }
     ret false;
 }
 
@@ -475,7 +475,7 @@ fn file_might_not_converge(filename: str) -> bool {
     ];
 
 
-    for f in confusing_files { if contains(filename, f) { ret true; } }
+    for confusing_files.each {|f| if contains(filename, f) { ret true; } }
 
     ret false;
 }
@@ -509,7 +509,7 @@ fn check_roundtrip_convergence(code: @str, maxIters: uint) {
 
 fn check_convergence(files: [str]) {
     #error("pp convergence tests: %u files", vec::len(files));
-    for file in files {
+    for files.each {|file|
         if !file_might_not_converge(file) {
             let s = @result::get(io::read_whole_file_str(file));
             if !content_might_not_converge(*s) {
@@ -522,7 +522,7 @@ fn check_convergence(files: [str]) {
 }
 
 fn check_variants(files: [str], cx: context) {
-    for file in files {
+    for files.each {|file|
         if cx.mode == tm_converge && file_might_not_converge(file) {
             #error("Skipping convergence test based on file_might_not_converge");
             cont;

src/libcore/vec.rs

@@ -62,7 +62,7 @@ export zip;
 export swap;
 export reverse;
 export reversed;
-export iter, each, eachi;
+export iter, iter_between, each, eachi;
 export iter2;
 export iteri;
 export riter;

src/librustsyntax/ast_util.rs

@@ -142,11 +142,11 @@ fn float_ty_to_str(t: float_ty) -> str {
 fn is_exported(i: ident, m: _mod) -> bool {
     let mut local = false;
     let mut parent_enum : option<ident> = none;
-    for it: @item in m.items {
+    for m.items.each {|it|
         if it.ident == i { local = true; }
         alt it.node {
           item_enum(variants, _) {
-            for v: variant in variants {
+            for variants.each {|v|
                 if v.node.name == i {
                    local = true;
                    parent_enum = some(it.ident);
@@ -158,11 +158,11 @@ fn is_exported(i: ident, m: _mod) -> bool {
         if local { break; }
     }
     let mut has_explicit_exports = false;
-    for vi: @view_item in m.view_items {
+    for m.view_items.each {|vi|
         alt vi.node {
           view_item_export(vps) {
             has_explicit_exports = true;
-            for vp in vps {
+            for vps.each {|vp|
                 alt vp.node {
                   ast::view_path_simple(id, _, _) {
                     if id == i { ret true; }
@@ -177,7 +177,7 @@ fn is_exported(i: ident, m: _mod) -> bool {
                   ast::view_path_list(path, ids, _) {
                     if vec::len(*path) == 1u {
                         if i == path[0] { ret true; }
-                        for id in ids {
+                        for ids.each {|id|
                             if id.node.name == i { ret true; }
                         }
                     } else {
@@ -278,14 +278,14 @@ fn public_methods(ms: [@method]) -> [@method] {
 
 fn split_class_items(cs: [@class_member]) -> ([ivar], [@method]) {
     let mut vs = [], ms = [];
-    for c in cs {
+    for cs.each {|c|
       alt c.node {
         instance_var(i, t, cm, id, privacy) {
           vs += [{ident: i, ty: t, cm: cm, id: id, privacy: privacy}];
         }
         class_method(m) { ms += [m]; }
       }
-    }
+    };
     (vs, ms)
 }
 

src/librustsyntax/attr.rs

@@ -46,7 +46,7 @@ fn find_linkage_metas(attrs: [ast::attribute]) -> [@ast::meta_item] {
 
 fn find_linkage_attrs(attrs: [ast::attribute]) -> [ast::attribute] {
     let mut found = [];
-    for attr: ast::attribute in find_attrs_by_name(attrs, "link") {
+    for find_attrs_by_name(attrs, "link").each {|attr|
         alt attr.node.value.node {
           ast::meta_list(_, _) { found += [attr] }
           _ { #debug("ignoring link attribute that has incorrect type"); }
@@ -150,7 +150,7 @@ fn attr_meta(attr: ast::attribute) -> @ast::meta_item { @attr.node.value }
 // Get the meta_items from inside a vector of attributes
 fn attr_metas(attrs: [ast::attribute]) -> [@ast::meta_item] {
     let mut mitems = [];
-    for a: ast::attribute in attrs { mitems += [attr_meta(a)]; }
+    for attrs.each {|a| mitems += [attr_meta(a)]; }
     ret mitems;
 }
 
@@ -178,7 +178,7 @@ fn eq(a: @ast::meta_item, b: @ast::meta_item) -> bool {
 fn contains(haystack: [@ast::meta_item], needle: @ast::meta_item) -> bool {
     #debug("looking for %s",
            print::pprust::meta_item_to_str(*needle));
-    for item: @ast::meta_item in haystack {
+    for haystack.each {|item|
         #debug("looking in %s",
                print::pprust::meta_item_to_str(*item));
         if eq(item, needle) { #debug("found it!"); ret true; }
@@ -207,12 +207,12 @@ fn sort_meta_items(items: [@ast::meta_item]) -> [@ast::meta_item] {
 
     // This is sort of stupid here, converting to a vec of mutables and back
     let mut v: [mut @ast::meta_item] = [mut];
-    for mi: @ast::meta_item in items { v += [mut mi]; }
+    for items.each {|mi| v += [mut mi]; }
 
     std::sort::quick_sort(lteq, v);
 
     let mut v2: [@ast::meta_item] = [];
-    for mi: @ast::meta_item in v { v2 += [mi]; }
+    for v.each {|mi| v2 += [mi]; }
     ret v2;
 }
 
@@ -231,7 +231,7 @@ fn remove_meta_items_by_name(items: [@ast::meta_item], name: str) ->
 fn require_unique_names(diagnostic: span_handler,
                         metas: [@ast::meta_item]) {
     let map = map::str_hash();
-    for meta: @ast::meta_item in metas {
+    for metas.each {|meta|
         let name = get_meta_item_name(meta);
         if map.contains_key(name) {
             diagnostic.span_fatal(meta.span,

src/librustsyntax/codemap.rs

@@ -187,7 +187,7 @@ fn get_snippet(cm: codemap::codemap, fidx: uint, lo: uint, hi: uint) -> str
 }
 
 fn get_filemap(cm: codemap, filename: str) -> filemap {
-    for fm: filemap in cm.files { if fm.name == filename { ret fm; } }
+    for cm.files.each {|fm| if fm.name == filename { ret fm; } }
     //XXjdm the following triggers a mismatched type bug
     //      (or expected function, found _|_)
     fail; // ("asking for " + filename + " which we don't know about");

src/librustsyntax/diagnostic.rs

@@ -201,7 +201,7 @@ fn highlight_lines(cm: codemap::codemap, sp: span,
         elided = true;
     }
     // Print the offending lines
-    for line: uint in display_lines {
+    for display_lines.each {|line|
         io::stderr().write_str(#fmt["%s:%u ", fm.name, line + 1u]);
         let s = codemap::get_line(fm, line as int) + "\n";
         io::stderr().write_str(s);

src/librustsyntax/ext/build.rs

@@ -68,7 +68,7 @@ fn mk_rec_e(cx: ext_ctxt, sp: span,
             fields: [{ident: ast::ident, ex: @ast::expr}]) ->
     @ast::expr {
     let mut astfields: [ast::field] = [];
-    for field: {ident: ast::ident, ex: @ast::expr} in fields {
+    for fields.each {|field|
         let ident = field.ident;
         let val = field.ex;
         let astfield =

src/librustsyntax/ext/concat_idents.rs

@@ -11,7 +11,7 @@ fn expand_syntax_ext(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
           }
         };
     let mut res: ast::ident = "";
-    for e: @ast::expr in args {
+    for args.each {|e|
         res += expr_to_ident(cx, e, "expected an ident");
     }