diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2012-09-18 21:41:37 -0700 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2012-09-19 10:52:59 -0700 |
| commit | 9cf271fe96b474d514b1052935db70c4056cf076 (patch) | |
| tree | 7a6fb31efeaa4de91317c16aca824153aaaf988c /src/libstd/test.rs | |
| parent | 62b7f4d800325b46002c47d23b58a9f2b7fabb9b (diff) | |
| download | rust-9cf271fe96b474d514b1052935db70c4056cf076.tar.gz rust-9cf271fe96b474d514b1052935db70c4056cf076.zip | |
De-mode vec::each() and many of the str iteration routines
Note that the method foo.each() is not de-moded, nor the other vec routines.
Diffstat (limited to 'src/libstd/test.rs')
| -rw-r--r-- | src/libstd/test.rs | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/src/libstd/test.rs b/src/libstd/test.rs index 76b6310c853..8692a9a440a 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -227,7 +227,7 @@ fn print_failures(st: ConsoleTestState) { let failures = vec::map(failures, |test| test.name); let failures = sort::merge_sort(|x, y| str::le(*x, *y), failures); for vec::each(failures) |name| { - st.out.write_line(fmt!(" %s", name)); + st.out.write_line(fmt!(" %s", *name)); } } @@ -535,30 +535,34 @@ mod tests { ~"test::sort_tests"]; let tests = { - let testfn = fn~() { }; - let mut tests = ~[]; + let testfn = fn~() { }; + let mut tests = ~[]; for vec::each(names) |name| { - let test = {name: name, testfn: copy testfn, ignore: false, - should_fail: false}; - tests += ~[test]; - } - tests - }; - let filtered = filter_tests(opts, tests); + let test = {name: *name, testfn: copy testfn, ignore: false, + should_fail: false}; + vec::push(tests, test); + } + tests + }; + let filtered = filter_tests(opts, tests); - let expected = - ~[~"int::test_pow", ~"int::test_to_str", ~"sha1::test", - ~"test::do_not_run_ignored_tests", - ~"test::filter_for_ignored_option", - ~"test::first_free_arg_should_be_a_filter", - ~"test::ignored_tests_result_in_ignored", - ~"test::parse_ignored_flag", - ~"test::sort_tests"]; + let expected = + ~[~"int::test_pow", ~"int::test_to_str", ~"sha1::test", + ~"test::do_not_run_ignored_tests", + ~"test::filter_for_ignored_option", + ~"test::first_free_arg_should_be_a_filter", + ~"test::ignored_tests_result_in_ignored", + ~"test::parse_ignored_flag", + ~"test::sort_tests"]; - let pairs = vec::zip(expected, filtered); + let pairs = vec::zip(expected, filtered); - for vec::each(pairs) |p| { let (a, b) = copy p; assert (a == b.name); } -} + for vec::each(pairs) |p| { + match *p { + (a, b) => { assert (a == b.name); } + } + } + } } |
