demode the each() method on vec and other iterables.

Author: nikomatsakis

src/cargo/cargo.rs

@@ -325,9 +325,9 @@ fn load_crate(filename: &Path) -> Option<crate> {
                 let mut attr_from = ~"";
 
               for m.each |item| {
-                    match attr::get_meta_item_value_str(item) {
+                    match attr::get_meta_item_value_str(*item) {
                         Some(value) => {
-                            let name = attr::get_meta_item_name(item);
+                            let name = attr::get_meta_item_name(*item);
 
                             match name {
                                 ~"vers" => attr_vers = value,
@@ -530,7 +530,7 @@ fn load_one_source_package(src: source, p: map::HashMap<~str, json::Json>) {
     match p.find(~"tags") {
         Some(json::List(js)) => {
           for (*js).each |j| {
-                match j {
+                match *j {
                     json::String(j) => vec::grow(tags, 1u, *j),
                     _ => ()
                 }
@@ -602,7 +602,7 @@ fn load_source_packages(c: &cargo, src: source) {
     match json::from_str(result::get(pkgstr)) {
         Ok(json::List(js)) => {
           for (*js).each |j| {
-                match j {
+                match *j {
                     json::Dict(p) => {
                         load_one_source_package(src, p);
                     }
@@ -715,7 +715,7 @@ fn configure(opts: options) -> cargo {
 fn for_each_package(c: &cargo, b: fn(source, package)) {
     for c.sources.each_value |v| {
         for v.packages.each |p| {
-            b(v, p);
+            b(v, *p);
         }
     }
 }
@@ -773,15 +773,15 @@ fn install_one_crate(c: &cargo, path: &Path, cf: &Path) {
              !str::starts_with(option::get(ct.filename()),
                                ~"lib")) {
             debug!("  bin: %s", ct.to_str());
-            install_to_dir(ct, &c.bindir);
+            install_to_dir(*ct, &c.bindir);
             if c.opts.mode == system_mode {
                 // FIXME (#2662): Put this file in PATH / symlink it so it can
                 // be used as a generic executable
                 // `cargo install -G rustray` and `rustray file.obj`
             }
         } else {
             debug!("  lib: %s", ct.to_str());
-            install_to_dir(ct, &c.libdir);
+            install_to_dir(*ct, &c.libdir);
         }
     }
 }
@@ -814,7 +814,7 @@ fn install_source(c: &cargo, path: &Path) {
     }
 
     for cratefiles.each |cf| {
-        match load_crate(&cf) {
+        match load_crate(cf) {
             None => loop,
             Some(crate) => {
               for crate.deps.each |query| {
@@ -823,15 +823,15 @@ fn install_source(c: &cargo, path: &Path) {
                     // condition")
 
                     let wd = get_temp_workdir(c);
-                    install_query(c, &wd, query);
+                    install_query(c, &wd, *query);
                 }
 
                 os::change_dir(path);
 
                 if c.opts.test {
-                    test_one_crate(c, path, &cf);
+                    test_one_crate(c, path, cf);
                 }
-                install_one_crate(c, path, &cf);
+                install_one_crate(c, path, cf);
             }
         }
     }
@@ -915,7 +915,7 @@ fn install_uuid(c: &cargo, wd: &Path, uuid: ~str) {
     }
     error(~"found multiple packages:");
     for ps.each |elt| {
-        let (sname,p) = copy elt;
+        let (sname,p) = copy *elt;
         info(~"  " + sname + ~"/" + p.uuid + ~" (" + p.name + ~")");
     }
 }
@@ -939,7 +939,7 @@ fn install_named(c: &cargo, wd: &Path, name: ~str) {
     }
     error(~"found multiple packages:");
     for ps.each |elt| {
-        let (sname,p) = copy elt;
+        let (sname,p) = copy *elt;
         info(~"  " + sname + ~"/" + p.uuid + ~" (" + p.name + ~")");
     }
 }
@@ -949,7 +949,7 @@ fn install_uuid_specific(c: &cargo, wd: &Path, src: ~str, uuid: ~str) {
         Some(s) => {
             for s.packages.each |p| {
                 if p.uuid == uuid {
-                    install_package(c, src, wd, p);
+                    install_package(c, src, wd, *p);
                     return;
                 }
             }
@@ -964,7 +964,7 @@ fn install_named_specific(c: &cargo, wd: &Path, src: ~str, name: ~str) {
         Some(s) => {
             for s.packages.each |p| {
                 if p.name == name {
-                    install_package(c, src, wd, p);
+                    install_package(c, src, wd, *p);
                     return;
                 }
             }
@@ -1002,22 +1002,22 @@ fn cmd_uninstall(c: &cargo) {
 
     if is_uuid(target) {
         for os::list_dir(lib).each |file| {
-            match str::find_str(file, ~"-" + target + ~"-") {
-              Some(_) => if !try_uninstall(&lib.push(file)) { return },
+            match str::find_str(*file, ~"-" + target + ~"-") {
+              Some(_) => if !try_uninstall(&lib.push(*file)) { return },
               None => ()
             }
         }
         error(~"can't find package with uuid: " + target);
     } else {
         for os::list_dir(lib).each |file| {
-            match str::find_str(file, ~"lib" + target + ~"-") {
-              Some(_) => if !try_uninstall(&lib.push(file)) { return },
+            match str::find_str(*file, ~"lib" + target + ~"-") {
+              Some(_) => if !try_uninstall(&lib.push(*file)) { return },
               None => ()
             }
         }
         for os::list_dir(bin).each |file| {
-            match str::find_str(file, target) {
-              Some(_) => if !try_uninstall(&lib.push(file)) { return },
+            match str::find_str(*file, target) {
+              Some(_) => if !try_uninstall(&lib.push(*file)) { return },
               None => ()
             }
         }

src/cargo/pgp.rs

@@ -95,7 +95,7 @@ fn verify(root: &Path, data: &Path, sig: &Path, keyfp: ~str) -> bool {
                   ~"--verify", sig.to_str(),
                  data.to_str()]);
     let res = ~"Primary key fingerprint: " + keyfp;
-    for str::split_char(p.err, '\n').each |line| {
+    for str::split_char_each(p.err, '\n') |line| {
         if line == res { return true; }
     }
     return false;

src/compiletest/compiletest.rs

@@ -138,7 +138,7 @@ fn make_tests(config: config) -> ~[test::TestDesc] {
            config.src_base.to_str());
     let mut tests = ~[];
     for os::list_dir_path(&config.src_base).each |file| {
-        let file = copy file;
+        let file = copy *file;
         debug!("inspecting file %s", file.to_str());
         if is_test(config, file) {
             vec::push(tests, make_test(config, file))
@@ -160,11 +160,11 @@ fn is_test(config: config, testfile: &Path) -> bool {
     let mut valid = false;
 
     for valid_extensions.each |ext| {
-        if str::ends_with(name, ext) { valid = true; }
+        if str::ends_with(name, *ext) { valid = true; }
     }
 
     for invalid_prefixes.each |pre| {
-        if str::starts_with(name, pre) { valid = false; }
+        if str::starts_with(name, *pre) { valid = false; }
     }
 
     return valid;

src/compiletest/runtest.rs

@@ -219,7 +219,7 @@ fn check_error_patterns(props: test_props,
     let mut next_err_pat = props.error_patterns[next_err_idx];
     let mut done = false;
     for str::split_char(procres.stderr, '\n').each |line| {
-        if str::contains(line, next_err_pat) {
+        if str::contains(*line, next_err_pat) {
             debug!("found error pattern %s", next_err_pat);
             next_err_idx += 1u;
             if next_err_idx == vec::len(props.error_patterns) {
@@ -240,7 +240,7 @@ fn check_error_patterns(props: test_props,
                            missing_patterns[0]), procres);
     } else {
         for missing_patterns.each |pattern| {
-            error(fmt!("error pattern '%s' not found!", pattern));
+            error(fmt!("error pattern '%s' not found!", *pattern));
         }
         fatal_procres(~"multiple error patterns not found", procres);
     }
@@ -273,10 +273,10 @@ fn check_expected_errors(expected_errors: ~[errors::expected_error],
         for vec::eachi(expected_errors) |i, ee| {
             if !found_flags[i] {
                 debug!("prefix=%s ee.kind=%s ee.msg=%s line=%s",
-                       prefixes[i], ee.kind, ee.msg, line);
-                if (str::starts_with(line, prefixes[i]) &&
-                    str::contains(line, ee.kind) &&
-                    str::contains(line, ee.msg)) {
+                       prefixes[i], ee.kind, ee.msg, *line);
+                if (str::starts_with(*line, prefixes[i]) &&
+                    str::contains(*line, ee.kind) &&
+                    str::contains(*line, ee.msg)) {
                     found_flags[i] = true;
                     was_expected = true;
                     break;
@@ -285,13 +285,13 @@ fn check_expected_errors(expected_errors: ~[errors::expected_error],
         }
 
         // ignore this msg which gets printed at the end
-        if str::contains(line, ~"aborting due to") {
+        if str::contains(*line, ~"aborting due to") {
             was_expected = true;
         }
 
-        if !was_expected && is_compiler_error_or_warning(line) {
+        if !was_expected && is_compiler_error_or_warning(*line) {
             fatal_procres(fmt!("unexpected compiler error or warning: '%s'",
-                               line),
+                               *line),
                           procres);
         }
     }

src/fuzzer/fuzzer.rs

@@ -33,7 +33,7 @@ fn find_rust_files(files: &mut ~[Path], path: &Path) {
         && !contains(path.to_str(), ~"compile-fail")
         && !contains(path.to_str(), ~"build") {
         for os::list_dir_path(path).each |p| {
-            find_rust_files(files, p);
+            find_rust_files(files, *p);
         }
     }
 }
@@ -463,15 +463,15 @@ fn content_is_dangerous_to_run(code: ~str) -> bool {
          ~"unsafe",
          ~"log"];    // python --> rust pipe deadlock?
 
-    for dangerous_patterns.each |p| { if contains(code, p) { return true; } }
+    for dangerous_patterns.each |p| { if contains(code, *p) { return true; } }
     return false;
 }
 
 fn content_is_dangerous_to_compile(code: ~str) -> bool {
     let dangerous_patterns =
         ~[~"xfail-test"];
 
-    for dangerous_patterns.each |p| { if contains(code, p) { return true; } }
+    for dangerous_patterns.each |p| { if contains(code, *p) { return true; } }
     return false;
 }
 
@@ -487,7 +487,7 @@ fn content_might_not_converge(code: ~str) -> bool {
          ~"\n\n\n\n\n"  // https://github.com/mozilla/rust/issues/850
         ];
 
-    for confusing_patterns.each |p| { if contains(code, p) { return true; } }
+    for confusing_patterns.each |p| { if contains(code, *p) { return true; } }
     return false;
 }
 
@@ -502,7 +502,7 @@ fn file_might_not_converge(filename: &Path) -> bool {
 
 
     for confusing_files.each |f| {
-        if contains(filename.to_str(), f) {
+        if contains(filename.to_str(), *f) {
             return true;
         }
     }
@@ -540,8 +540,8 @@ fn check_roundtrip_convergence(code: @~str, maxIters: uint) {
 fn check_convergence(files: &[Path]) {
     error!("pp convergence tests: %u files", vec::len(files));
     for files.each |file| {
-        if !file_might_not_converge(&file) {
-            let s = @result::get(io::read_whole_file_str(&file));
+        if !file_might_not_converge(file) {
+            let s = @result::get(io::read_whole_file_str(file));
             if !content_might_not_converge(*s) {
                 error!("pp converge: %s", file.to_str());
                 // Change from 7u to 2u once
@@ -555,13 +555,13 @@ fn check_convergence(files: &[Path]) {
 fn check_variants(files: &[Path], cx: context) {
     for files.each |file| {
         if cx.mode == tm_converge &&
-            file_might_not_converge(&file) {
+            file_might_not_converge(file) {
             error!("Skipping convergence test based on\
                     file_might_not_converge");
             loop;
         }
 
-        let s = @result::get(io::read_whole_file_str(&file));
+        let s = @result::get(io::read_whole_file_str(file));
         if contains(*s, ~"#") {
             loop; // Macros are confusing
         }
@@ -572,11 +572,13 @@ fn check_variants(files: &[Path], cx: context) {
             loop;
         }
 
-        log(error, ~"check_variants: " + file.to_str());
+        let file_str = file.to_str();
+
+        log(error, ~"check_variants: " + file_str);
         let sess = parse::new_parse_sess(option::None);
         let crate =
             parse::parse_crate_from_source_str(
-                file.to_str(),
+                file_str,
                 s, ~[], sess);
         io::with_str_reader(*s, |rdr| {
             error!("%s",
@@ -586,12 +588,12 @@ fn check_variants(files: &[Path], cx: context) {
                        syntax::parse::token::mk_fake_ident_interner(),
                        sess.span_diagnostic,
                        crate,
-                       file.to_str(),
+                       file_str,
                        rdr, a,
                        pprust::no_ann(),
-                       false) ))
+                       false)))
         });
-        check_variants_of_ast(*crate, sess.cm, &file, cx);
+        check_variants_of_ast(*crate, sess.cm, file, cx);
     }
 }
 

src/libcore/dlist.rs

@@ -678,7 +678,7 @@ mod tests {
         let mut x = 0;
         for l.each |i| {
             x += 1;
-            if (i == 3) { break; }
+            if (*i == 3) { break; }
         }
         assert x == 3;
     }

src/libcore/dvec.rs

@@ -272,7 +272,7 @@ impl<A: Copy> DVec<A> {
             }
            };
 
-        for ts.each |t| { vec::push(v, t) };
+        for ts.each |t| { vec::push(v, *t) };
            v
         }
     }

src/libcore/iter-trait.rs

@@ -7,7 +7,7 @@ use inst::{IMPL_T, EACH, SIZE_HINT};
 export extensions;
 
 impl<A> IMPL_T<A>: iter::BaseIter<A> {
-    pure fn each(blk: fn(A) -> bool) { EACH(self, blk) }
+    pure fn each(blk: fn(v: &A) -> bool) { EACH(self, blk) }
     pure fn size_hint() -> Option<uint> { SIZE_HINT(self) }
 }
 

src/libcore/iter-trait/dlist.rs

@@ -8,12 +8,12 @@ type IMPL_T<A> = dlist::DList<A>;
  * e.g. breadth-first search with in-place enqueues), but removing the current
  * node is forbidden.
  */
-pure fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {
+pure fn EACH<A>(self: IMPL_T<A>, f: fn(v: &A) -> bool) {
     let mut link = self.peek_n();
     while option::is_some(link) {
         let nobe = option::get(link);
         assert nobe.linked;
-        if !f(nobe.data) { break; }
+        if !f(&nobe.data) { break; }
         // Check (weakly) that the user didn't do a remove.
         if self.size == 0 {
             fail ~"The dlist became empty during iteration??"

src/libcore/iter-trait/dvec.rs

@@ -6,7 +6,7 @@ type IMPL_T<A> = dvec::DVec<A>;
  *
  * Attempts to access this dvec during iteration will fail.
  */
-pure fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {
+pure fn EACH<A>(self: IMPL_T<A>, f: fn(v: &A) -> bool) {
     unsafe {
         do self.swap |v| {
             v.each(f);

src/libcore/iter-trait/option.rs

@@ -1,10 +1,10 @@
 #[allow(non_camel_case_types)]
 type IMPL_T<A> = Option<A>;
 
-pure fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {
+pure fn EACH<A>(self: IMPL_T<A>, f: fn(v: &A) -> bool) {
     match self {
       None => (),
-      Some(a) => { f(a); }
+      Some(ref a) => { f(a); }
     }
 }