Skip to content

Commit 7e70348

Browse files
committed
---
yaml --- r: 4756 b: refs/heads/master c: 53df58a h: refs/heads/master v: v3
1 parent eec53c3 commit 7e70348

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 7bd0437b08a198a098025271103321b921d60645
2+
refs/heads/master: 53df58a177365703ef7a798ffb3c468cb7d1a5ae

trunk/src/comp/front/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ fn mk_test_main_call(cx: &test_ctxt) -> @ast::expr {
355355
// Call std::test::test_main
356356
let test_main_path: ast::path =
357357
nospan({global: false,
358-
idents: ~["std", "test", "test_main_ivec"],
358+
idents: ~["std", "test", "test_main"],
359359
types: ~[]});
360360

361361
let test_main_path_expr_: ast::expr_ = ast::expr_path(test_main_path);

trunk/src/lib/test.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type test_desc = {name: test_name, fn: test_fn, ignore: bool};
4949

5050
// The default console test runner. It accepts the command line
5151
// arguments and a vector of test_descs (generated at compile time).
52-
fn test_main_ivec(args: &[str], tests: &[test_desc]) {
52+
fn test_main(args: &[str], tests: &[test_desc]) {
5353
check (vec::is_not_empty(args));
5454
let opts =
5555
alt parse_opts(args) {
@@ -59,10 +59,6 @@ fn test_main_ivec(args: &[str], tests: &[test_desc]) {
5959
if !run_tests_console(opts, tests) { fail "Some tests failed"; }
6060
}
6161

62-
fn test_main(args: &vec<str>, tests: &[test_desc]) {
63-
test_main_ivec(vec::from_vec(args), tests);
64-
}
65-
6662
type test_opts = {filter: option::t<str>, run_ignored: bool};
6763

6864
type opt_res = either::t<test_opts, str>;

0 commit comments

Comments
 (0)