rollup merge of #21830: japaric/for-cleanup

Conflicts:
	src/librustc/metadata/filesearch.rs
	src/librustc_back/target/mod.rs
	src/libstd/os.rs
	src/libstd/sys/windows/os.rs
	src/libsyntax/ext/tt/macro_parser.rs
	src/libsyntax/print/pprust.rs
	src/test/compile-fail/issue-2149.rs

diff --cc src/compiletest/compiletest.rs
Simple merge

diff --cc src/compiletest/runtest.rs
Simple merge

diff --cc src/compiletest/util.rs
Simple merge

diff --cc src/librustc/lib.rs
Simple merge

diff --cc src/librustc/lint/builtin.rs
Simple merge

diff --cc src/librustc/metadata/creader.rs
Simple merge

diff --cc src/librustc/metadata/filesearch.rs
index 45dd4b4dbacbdb6419a9f3655d7f963bdd89d7c8,6197846ec6f569ce49f13600f7109b5a0319863d..1b2d82e68c19f2fbcb96f60fc937f898badbe0b6
--- 1/src/librustc/metadata/filesearch.rs
--- 2/src/librustc/metadata/filesearch.rs
+++ b/src/librustc/metadata/filesearch.rs
@@@ -243,8 -243,7 +243,7 @@@ pub fn rust_path() -> Vec<Path> 
          }
          cwd.pop();
      }
-     let h = env::home_dir();
-     for h in h.iter() {
 -    if let Some(h) = os::homedir() {
++    if let Some(h) = env::home_dir() {
          let p = h.join(".rust");
          if !env_rust_path.contains(&p) && p.exists() {
              env_rust_path.push(p);

diff --cc src/librustc/plugin/load.rs
Simple merge

diff --cc src/librustc_back/archive.rs
Simple merge

diff --cc src/librustc_back/rpath.rs
Simple merge

diff --cc src/librustc_driver/driver.rs
Simple merge

diff --cc src/librustc_driver/lib.rs
Simple merge

diff --cc src/librustc_llvm/lib.rs
Simple merge

diff --cc src/librustc_trans/lib.rs
Simple merge

diff --cc src/librustc_trans/save/mod.rs
Simple merge

diff --cc src/librustc_trans/trans/base.rs
Simple merge

diff --cc src/librustc_trans/trans/common.rs
Simple merge

diff --cc src/librustc_trans/trans/debuginfo.rs
Simple merge

diff --cc src/librustc_trans/trans/intrinsic.rs
Simple merge

diff --cc src/librustc_typeck/check/mod.rs
Simple merge

diff --cc src/librustdoc/lib.rs
Simple merge

diff --cc src/libstd/ffi/os_str.rs
Simple merge

diff --cc src/libstd/lib.rs
Simple merge

diff --cc src/libstd/old_io/process.rs
Simple merge

diff --cc src/libstd/old_io/test.rs
Simple merge

diff --cc src/libstd/os.rs
index fbb70fc5b6beb32122999383b7a76e6a403db086,2df97bf7752262769a6e134760d13bb6b05eab40..d92f361af0bf24508fe18e9e4b11d5ed30aa5299
--- 1/src/libstd/os.rs
--- 2/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@@ -922,9 -970,9 +922,9 @@@ impl MemoryMap 
          let mut fd = -1;
          let mut offset = 0;
          let mut custom_flags = false;
 -        let len = round_up(min_len, page_size());
 +        let len = round_up(min_len, env::page_size());
  
-         for &o in options.iter() {
+         for &o in options {
              match o {
                  MapReadable => { prot |= libc::PROT_READ; },
                  MapWritable => { prot |= libc::PROT_WRITE; },
@@@ -1001,9 -1049,9 +1001,9 @@@ impl MemoryMap 
          let mut executable = false;
          let mut handle: HANDLE = libc::INVALID_HANDLE_VALUE;
          let mut offset: uint = 0;
 -        let len = round_up(min_len, page_size());
 +        let len = round_up(min_len, env::page_size());
  
-         for &o in options.iter() {
+         for &o in options {
              match o {
                  MapReadable => { readable = true; },
                  MapWritable => { writable = true; },

diff --cc src/libstd/sys/common/net.rs
Simple merge

diff --cc src/libstd/sys/unix/process.rs
Simple merge

diff --cc src/libstd/sys/windows/process.rs
index 043fdb38805dc8d20b422c48491adde83a41e677,58797111a20710526334b87490d5e7945e021850..3ca735f7fdfd347bfba8c86d39b9afe345c35bd5
--- 1/src/libstd/sys/windows/process.rs
--- 2/src/libstd/sys/windows/process.rs
+++ b/src/libstd/sys/windows/process.rs
@@@ -147,9 -147,9 +147,9 @@@ impl Process 
  
                  // Split the value and test each path to see if the
                  // program exists.
-                 for path in os::split_paths(v.container_as_bytes()).into_iter() {
+                 for path in os::split_paths(v.container_as_bytes()) {
                      let path = path.join(cfg.program().as_bytes())
 -                                   .with_extension(os::consts::EXE_EXTENSION);
 +                                   .with_extension(env::consts::EXE_EXTENSION);
                      if path.exists() {
                          return Some(CString::from_slice(path.as_vec()))
                      }

diff --cc src/libstd/sys/windows/thread_local.rs
Simple merge

diff --cc src/libsyntax/ast_util.rs
Simple merge

diff --cc src/libsyntax/codemap.rs
Simple merge

diff --cc src/libsyntax/diagnostic.rs
Simple merge

diff --cc src/libsyntax/ext/deriving/generic/mod.rs
Simple merge

diff --cc src/libsyntax/ext/expand.rs
Simple merge

diff --cc src/libsyntax/ext/quote.rs
Simple merge

diff --cc src/libsyntax/ext/tt/macro_parser.rs
index 69c7d10a82c9a3316de23fd0e26df65b5bf08a2e,0eec182e0fc66d5fbcd4b662a5277839b4333a7c..823efdd3eed225362d1f46ac3ab6a47a1dad22fa
--- 1/src/libsyntax/ext/tt/macro_parser.rs
--- 2/src/libsyntax/ext/tt/macro_parser.rs
+++ b/src/libsyntax/ext/tt/macro_parser.rs
@@@ -238,8 -238,8 +238,8 @@@ pub fn nameize(p_s: &ParseSess, ms: &[T
          }
      }
      let mut ret_val = HashMap::new();
 -    let mut idx = 0us;
 +    let mut idx = 0;
-     for m in ms.iter() { n_rec(p_s, m, res, &mut ret_val, &mut idx) }
+     for m in ms { n_rec(p_s, m, res, &mut ret_val, &mut idx) }
      ret_val
  }
  
@@@ -442,9 -442,9 +442,9 @@@ pub fn parse(sess: &ParseSess
  
          /* error messages here could be improved with links to orig. rules */
          if token_name_eq(&tok, &token::Eof) {
 -            if eof_eis.len() == 1us {
 +            if eof_eis.len() == 1 {
                  let mut v = Vec::new();
-                 for dv in (&mut eof_eis[0]).matches.iter_mut() {
+                 for dv in &mut (&mut eof_eis[0]).matches {
                      v.push(dv.pop().unwrap());
                  }
                  return Success(nameize(sess, ms, &v[]));

diff --cc src/libsyntax/lib.rs
Simple merge

diff --cc src/libsyntax/parse/lexer/comments.rs
Simple merge

diff --cc src/libsyntax/parse/lexer/mod.rs
Simple merge

diff --cc src/libsyntax/parse/mod.rs
Simple merge

diff --cc src/libsyntax/parse/parser.rs
Simple merge

diff --cc src/libsyntax/print/pprust.rs
index a7ff486c634c57ad0437bae35e94ae778d14d67c,5c42485f239a524f548d52287781ab45ef0e3b8f..e6d895a49fcd77896657f8e1bedfaf6527e73f0f
--- 1/src/libsyntax/print/pprust.rs
--- 2/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@@ -591,9 -591,9 +591,9 @@@ impl<'a> State<'a> 
      pub fn commasep<T, F>(&mut self, b: Breaks, elts: &[T], mut op: F) -> IoResult<()> where
          F: FnMut(&mut State, &T) -> IoResult<()>,
      {
 -        try!(self.rbox(0us, b));
 +        try!(self.rbox(0, b));
          let mut first = true;
-         for elt in elts.iter() {
+         for elt in elts {
              if first { first = false; } else { try!(self.word_space(",")); }
              try!(op(self, elt));
          }
@@@ -609,13 -609,13 +609,13 @@@
          F: FnMut(&mut State, &T) -> IoResult<()>,
          G: FnMut(&T) -> codemap::Span,
      {
 -        try!(self.rbox(0us, b));
 +        try!(self.rbox(0, b));
          let len = elts.len();
 -        let mut i = 0us;
 +        let mut i = 0;
-         for elt in elts.iter() {
+         for elt in elts {
              try!(self.maybe_print_comment(get_span(elt).hi));
              try!(op(self, elt));
 -            i += 1us;
 +            i += 1;
              if i < len {
                  try!(word(&mut self.s, ","));
                  try!(self.maybe_print_trailing_comment(get_span(elt),
@@@ -1277,8 -1277,8 +1277,8 @@@
  
      pub fn print_outer_attributes(&mut self,
                                    attrs: &[ast::Attribute]) -> IoResult<()> {
 -        let mut count = 0us;
 +        let mut count = 0;
-         for attr in attrs.iter() {
+         for attr in attrs {
              match attr.node.style {
                  ast::AttrOuter => {
                      try!(self.print_attribute(attr));
@@@ -1295,8 -1295,8 +1295,8 @@@
  
      pub fn print_inner_attributes(&mut self,
                                    attrs: &[ast::Attribute]) -> IoResult<()> {
 -        let mut count = 0us;
 +        let mut count = 0;
-         for attr in attrs.iter() {
+         for attr in attrs {
              match attr.node.style {
                  ast::AttrInner => {
                      try!(self.print_attribute(attr));
@@@ -2221,10 -2221,10 +2221,10 @@@
              try!(space(&mut self.s));
          }
          try!(self.cbox(indent_unit));
 -        try!(self.ibox(0us));
 +        try!(self.ibox(0));
          try!(self.print_outer_attributes(&arm.attrs[]));
          let mut first = true;
-         for p in arm.pats.iter() {
+         for p in &arm.pats {
              if first {
                  first = false;
              } else {
@@@ -2307,9 -2307,9 +2307,9 @@@
          -> IoResult<()> {
          // It is unfortunate to duplicate the commasep logic, but we want the
          // self type and the args all in the same box.
 -        try!(self.rbox(0us, Inconsistent));
 +        try!(self.rbox(0, Inconsistent));
          let mut first = true;
-         for &explicit_self in opt_explicit_self.iter() {
+         if let Some(explicit_self) = opt_explicit_self {
              let m = match explicit_self {
                  &ast::SelfStatic => ast::MutImmutable,
                  _ => match decl.inputs[0].pat.node {
@@@ -2858,8 -2858,8 +2858,8 @@@
                      try!(word(&mut self.s, &cmnt.lines[0][]));
                      hardbreak(&mut self.s)
                  } else {
 -                    try!(self.ibox(0us));
 +                    try!(self.ibox(0));
-                     for line in cmnt.lines.iter() {
+                     for line in &cmnt.lines {
                          if !line.is_empty() {
                              try!(word(&mut self.s, &line[]));
                          }

diff --cc src/libterm/terminfo/searcher.rs
Simple merge

diff --cc src/libtest/lib.rs
Simple merge

diff --cc src/test/bench/shootout-mandelbrot.rs
Simple merge