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

rollup merge of #21830: japaric/for-cleanup

Browse Source 
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:
Alex Crichton
2015-02-02 11:01:12 -08:00
parent 075588a493 3484706c38
commit 7335c7dd63
319 changed files with 1308 additions and 1443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtest/lib.rs
View File

@@ -32,8 +32,6 @@
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
html_root_url = "http://doc.rust-lang.org/nightly/")]
#![cfg_attr(not(stage0), allow(unused_mut))] // NOTE: remove after stage0 snap
#![feature(asm, slicing_syntax)]
#![feature(box_syntax)]
#![feature(collections)]
@@ -576,7 +574,7 @@ impl<T: Writer> ConsoleTestState<T> {
try!(self.write_plain("\nfailures:\n"));
let mut failures = Vec::new();
let mut fail_out = String::new();
for &(ref f, ref stdout) in self.failures.iter() {
for &(ref f, ref stdout) in &self.failures {
failures.push(f.name.to_string());
if stdout.len() > 0 {
fail_out.push_str(format!("---- {} stdout ----\n\t",
@@ -593,7 +591,7 @@ impl<T: Writer> ConsoleTestState<T> {
try!(self.write_plain("\nfailures:\n"));
failures.sort();
for name in failures.iter() {
for name in &failures {
try!(self.write_plain(format!(" {}\n",
name.as_slice()).as_slice()));
}
@@ -652,7 +650,7 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn> ) -> old_io:
TrMetrics(mm) => {
let tname = test.name.as_slice();
let MetricMap(mm) = mm;
for (k,v) in mm.iter() {
for (k,v) in &mm {
st.metrics
.insert_metric(format!("{}.{}",
tname,
@@ -806,7 +804,7 @@ fn run_tests<F>(opts: &TestOpts,
// All benchmarks run at the end, in serial.
// (this includes metric fns)
for b in filtered_benchs_and_metrics.into_iter() {
for b in filtered_benchs_and_metrics {
try!(callback(TeWait(b.desc.clone(), b.testfn.padding())));
run_test(opts, !opts.run_benchmarks, b, tx.clone());
let (test, result, stdout) = rx.recv().unwrap();
@@ -1060,7 +1058,7 @@ impl Bencher {
let loop_run = Duration::span(|| {
for p in samples.iter_mut() {
for p in &mut *samples {
self.bench_n(n, |x| f(x));
*p = self.ns_per_iter() as f64;
};
@@ -1068,7 +1066,7 @@ impl Bencher {
stats::winsorize(samples, 5.0);
summ = Some(stats::Summary::new(samples));
for p in samples.iter_mut() {
for p in &mut *samples {
self.bench_n(5 * n, |x| f(x));
*p = self.ns_per_iter() as f64;
};
@@ -1299,7 +1297,7 @@ mod tests {
{
fn testfn() { }
let mut tests = Vec::new();
for name in names.iter() {
for name in &names {
let test = TestDescAndFn {
desc: TestDesc {
name: DynTestName((*name).clone()),