rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fallout from renaming

Browse Source
This commit is contained in:
Aaron Turon
2014-09-14 20:27:36 -07:00
parent d8dfe1957b
commit fc525eeb4e
210 changed files with 793 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtest/lib.rs
View File

@@ -949,7 +949,7 @@ fn run_tests(opts: &TestOpts,
// All benchmarks run at the end, in serial.
// (this includes metric fns)
for b in filtered_benchs_and_metrics.move_iter() {
for b in filtered_benchs_and_metrics.into_iter() {
try!(callback(TeWait(b.desc.clone(), b.testfn.padding())));
run_test(opts, !opts.run_benchmarks, b, tx.clone());
let (test, result, stdout) = rx.recv();
@@ -981,7 +981,7 @@ pub fn filter_tests(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> Vec<TestDescA
filtered = match opts.filter {
None => filtered,
Some(ref re) => {
filtered.move_iter()
filtered.into_iter()
.filter(|test| re.is_match(test.desc.name.as_slice())).collect()
}
};
@@ -1001,7 +1001,7 @@ pub fn filter_tests(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> Vec<TestDescA
None
}
};
filtered.move_iter().filter_map(|x| filter(x)).collect()
filtered.into_iter().filter_map(|x| filter(x)).collect()
};
// Sort the tests alphabetically
@@ -1011,7 +1011,7 @@ pub fn filter_tests(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> Vec<TestDescA
match opts.test_shard {
None => filtered,
Some((a,b)) => {
filtered.move_iter().enumerate()
filtered.into_iter().enumerate()
// note: using a - 1 so that the valid shards, for example, are
// 1.2 and 2.2 instead of 0.2 and 1.2
.filter(|&(i,_)| i % b == (a - 1))
@@ -1054,7 +1054,7 @@ pub fn run_test(opts: &TestOpts,
}
let result_future = task.try_future(testfn);
let stdout = reader.read_to_end().unwrap().move_iter().collect();
let stdout = reader.read_to_end().unwrap().into_iter().collect();
let task_result = result_future.unwrap();
let test_result = calc_result(&desc, task_result.is_ok());
monitor_ch.send((desc.clone(), test_result, stdout));
@@ -1328,7 +1328,7 @@ impl Bencher {
loop {
let loop_start = precise_time_ns();
for p in samples.mut_iter() {
for p in samples.iter_mut() {
self.bench_n(n, |x| f(x));
*p = self.ns_per_iter() as f64;
};
@@ -1336,7 +1336,7 @@ impl Bencher {
stats::winsorize(samples, 5.0);
let summ = stats::Summary::new(samples);
for p in samples.mut_iter() {
for p in samples.iter_mut() {
self.bench_n(5 * n, |x| f(x));
*p = self.ns_per_iter() as f64;
};