Update Rust language for 'make check-ref'

This commit is contained in:
Youngmin Yoo 2013-08-19 12:51:44 +09:00
parent c1d6137418
commit 001f3cd7b5

View file

@ -14,7 +14,7 @@ use std::cell::Cell;
use std::io; use std::io;
use std::os; use std::os;
use std::run; use std::run;
use extra::digest::{Digest, DigestUtil}; use extra::digest::Digest;
use extra::sha1::Sha1; use extra::sha1::Sha1;
use extra::test::{DynTestName, DynTestFn, TestDesc, TestOpts, TestDescAndFn}; use extra::test::{DynTestName, DynTestFn, TestDesc, TestOpts, TestDescAndFn};
use extra::test::run_tests_console; use extra::test::run_tests_console;
@ -34,8 +34,9 @@ fn main() {
logfile: None, logfile: None,
run_tests: true, run_tests: true,
run_benchmarks: false, run_benchmarks: false,
save_results: None, ratchet_noise_percent: None,
compare_results: None, ratchet_metrics: None,
save_metrics: None,
}; };
if !run_tests_console(&test_opts, tests) { if !run_tests_console(&test_opts, tests) {
@ -57,14 +58,14 @@ struct Reftest {
fn parse_lists(filenames: &[~str]) -> ~[TestDescAndFn] { fn parse_lists(filenames: &[~str]) -> ~[TestDescAndFn] {
let mut tests: ~[TestDescAndFn] = ~[]; let mut tests: ~[TestDescAndFn] = ~[];
for filenames.iter().advance |file| { for file in filenames.iter() {
let file_path = Path(*file); let file_path = Path(*file);
let contents = match io::read_whole_file_str(&file_path) { let contents = match io::read_whole_file_str(&file_path) {
Ok(x) => x, Ok(x) => x,
Err(s) => fail!(s) Err(s) => fail!(s)
}; };
for contents.line_iter().advance |line| { for line in contents.line_iter() {
let parts: ~[&str] = line.split_iter(' ').filter(|p| !p.is_empty()).collect(); let parts: ~[&str] = line.split_iter(' ').filter(|p| !p.is_empty()).collect();
if parts.len() != 3 { if parts.len() != 3 {