about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-08-16 22:27:02 -0700
committerBrian Anderson <banderson@mozilla.com>2011-08-17 09:55:55 -0700
commit53df58a177365703ef7a798ffb3c468cb7d1a5ae (patch)
tree05bb6aee7045bacf4ef750e60fa6bc47bd1958e6
parent7bd0437b08a198a098025271103321b921d60645 (diff)
Purge vecs from the std::test interface
-rw-r--r--src/comp/front/test.rs2
-rw-r--r--src/lib/test.rs6
2 files changed, 2 insertions, 6 deletions
diff --git a/src/comp/front/test.rs b/src/comp/front/test.rs
index 86944452662..36507cd6a00 100644
--- a/src/comp/front/test.rs
+++ b/src/comp/front/test.rs
@@ -355,7 +355,7 @@ fn mk_test_main_call(cx: &test_ctxt) -> @ast::expr {
     // Call std::test::test_main
     let test_main_path: ast::path =
         nospan({global: false,
-                idents: ~["std", "test", "test_main_ivec"],
+                idents: ~["std", "test", "test_main"],
                 types: ~[]});
 
     let test_main_path_expr_: ast::expr_ = ast::expr_path(test_main_path);
diff --git a/src/lib/test.rs b/src/lib/test.rs
index 9cde409df93..5b6d6b34c97 100644
--- a/src/lib/test.rs
+++ b/src/lib/test.rs
@@ -49,7 +49,7 @@ type test_desc = {name: test_name, fn: test_fn, ignore: bool};
 
 // The default console test runner. It accepts the command line
 // arguments and a vector of test_descs (generated at compile time).
-fn test_main_ivec(args: &[str], tests: &[test_desc]) {
+fn test_main(args: &[str], tests: &[test_desc]) {
     check (vec::is_not_empty(args));
     let opts =
         alt parse_opts(args) {
@@ -59,10 +59,6 @@ fn test_main_ivec(args: &[str], tests: &[test_desc]) {
     if !run_tests_console(opts, tests) { fail "Some tests failed"; }
 }
 
-fn test_main(args: &vec<str>, tests: &[test_desc]) {
-    test_main_ivec(vec::from_vec(args), tests);
-}
-
 type test_opts = {filter: option::t<str>, run_ignored: bool};
 
 type opt_res = either::t<test_opts, str>;