Merge remote-tracking branch 'remotes/origin/master' into str-remove-null

[rust.git] / src / librustpkg / util.rs

diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
index 7ef2b90297d732f116e875309418ef0d9bb779fe..7a5d8bca38a01ec617cc94fd295f49e9c3c28e69 100644 (file)
--- a/src/librustpkg/util.rs
+++ b/src/librustpkg/util.rs
@@ -105,12 +105,12 @@ fn fold_item(ctx: @mut ReadyCtx,
     let mut cmds = ~[];
     let mut had_pkg_do = false;
 
-    foreach attr in item.attrs.iter() {
+    for attr in item.attrs.iter() {
         if "pkg_do" == attr.name() {
             had_pkg_do = true;
             match attr.node.value.node {
                 ast::MetaList(_, ref mis) => {
-                    foreach mi in mis.iter() {
+                    for mi in mis.iter() {
                         match mi.node {
                             ast::MetaWord(cmd) => cmds.push(cmd.to_owned()),
                             _ => {}
@@ -211,7 +211,7 @@ pub fn compile_input(ctxt: &Ctx,
     let addl_lib_search_paths = @mut options.addl_lib_search_paths;
     // Make sure all the library directories actually exist, since the linker will complain
     // otherwise
-    foreach p in addl_lib_search_paths.iter() {
+    for p in addl_lib_search_paths.iter() {
         assert!(os::path_is_dir(p));
     }
 
@@ -275,7 +275,7 @@ pub fn compile_crate_from_input(input: &driver::input,
 
     debug!("Outputs are %? and output type = %?", outputs, sess.opts.output_type);
     debug!("additional libraries:");
-    foreach lib in sess.opts.addl_lib_search_paths.iter() {
+    for lib in sess.opts.addl_lib_search_paths.iter() {
         debug!("an additional library: %s", lib.to_str());
     }
     let analysis = driver::phase_3_run_analysis_passes(sess, crate);
@@ -304,7 +304,7 @@ pub fn compile_crate(ctxt: &Ctx, pkg_id: &PkgId,
                      what: OutputType) -> bool {
     debug!("compile_crate: crate=%s, dir=%s", crate.to_str(), dir.to_str());
     debug!("compile_crate: short_name = %s, flags =...", pkg_id.to_str());
-    foreach fl in flags.iter() {
+    for fl in flags.iter() {
         debug!("+++ %s", *fl);
     }
     compile_input(ctxt, pkg_id, crate, dir, flags, cfgs, opt, what)