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
This commit is contained in:
@@ -401,7 +401,7 @@ impl fmt::Debug for Command {
|
||||
/// character.
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
try!(write!(f, "{:?}", self.program));
|
||||
for arg in self.args.iter() {
|
||||
for arg in &self.args {
|
||||
try!(write!(f, " '{:?}'", arg));
|
||||
}
|
||||
Ok(())
|
||||
@@ -1046,7 +1046,7 @@ mod tests {
|
||||
let output = String::from_utf8(prog.wait_with_output().unwrap().output).unwrap();
|
||||
|
||||
let r = os::env();
|
||||
for &(ref k, ref v) in r.iter() {
|
||||
for &(ref k, ref v) in &r {
|
||||
// don't check windows magical empty-named variables
|
||||
assert!(k.is_empty() ||
|
||||
output.contains(format!("{}={}", *k, *v).as_slice()),
|
||||
@@ -1064,7 +1064,7 @@ mod tests {
|
||||
let output = String::from_utf8(prog.wait_with_output().unwrap().output).unwrap();
|
||||
|
||||
let r = os::env();
|
||||
for &(ref k, ref v) in r.iter() {
|
||||
for &(ref k, ref v) in &r {
|
||||
// don't check android RANDOM variables
|
||||
if *k != "RANDOM".to_string() {
|
||||
assert!(output.contains(format!("{}={}",
|
||||
|
||||
Reference in New Issue
Block a user