diff options
| author | Aaron Turon <aturon@mozilla.com> | 2014-09-14 20:27:36 -0700 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2014-09-16 14:37:48 -0700 |
| commit | fc525eeb4ec3443d29bce677f589b19f31c189bb (patch) | |
| tree | d807bad5c91171751157a945dde963dcfd4ea95e /src/compiletest | |
| parent | d8dfe1957b6541de8fe2797e248fe4bd2fac02d9 (diff) | |
Fallout from renaming
Diffstat (limited to 'src/compiletest')
| -rw-r--r-- | src/compiletest/compiletest.rs | 4 | ||||
| -rw-r--r-- | src/compiletest/procsrv.rs | 4 | ||||
| -rw-r--r-- | src/compiletest/runtest.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 6c6cd6f610f..8188cb17b27 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -259,7 +259,7 @@ pub fn run_tests(config: &Config) { // parallel (especially when we have lots and lots of child processes). // For context, see #8904 io::test::raise_fd_limit(); - let res = test::run_tests_console(&opts, tests.move_iter().collect()); + let res = test::run_tests_console(&opts, tests.into_iter().collect()); match res { Ok(true) => {} Ok(false) => fail!("Some tests failed"), @@ -400,4 +400,4 @@ fn extract_gdb_version(full_version_line: Option<String>) -> Option<String> { }, _ => None } -} \ No newline at end of file +} diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs index 2c3aa88a680..f3f860d470d 100644 --- a/src/compiletest/procsrv.rs +++ b/src/compiletest/procsrv.rs @@ -40,7 +40,7 @@ pub fn run(lib_path: &str, let mut cmd = Command::new(prog); cmd.args(args); add_target_env(&mut cmd, lib_path, aux_path); - for (key, val) in env.move_iter() { + for (key, val) in env.into_iter() { cmd.env(key, val); } @@ -72,7 +72,7 @@ pub fn run_background(lib_path: &str, let mut cmd = Command::new(prog); cmd.args(args); add_target_env(&mut cmd, lib_path, aux_path); - for (key, val) in env.move_iter() { + for (key, val) in env.into_iter() { cmd.env(key, val); } diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index c61db4ed2cf..40acb7da175 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -768,7 +768,7 @@ fn cleanup_debug_info_options(options: &Option<String>) -> Option<String> { "--debuginfo".to_string() ]; let new_options = - split_maybe_args(options).move_iter() + split_maybe_args(options).into_iter() .filter(|x| !options_to_remove.contains(x)) .collect::<Vec<String>>() .connect(" "); @@ -1461,7 +1461,7 @@ fn _arm_exec_compiled_test(config: &Config, // run test via adb_run_wrapper runargs.push("shell".to_string()); - for (key, val) in env.move_iter() { + for (key, val) in env.into_iter() { runargs.push(format!("{}={}", key, val)); } runargs.push(format!("{}/adb_run_wrapper.sh", config.adb_test_dir)); |
