Skip to content

Commit 6e53832

Browse files
Simplify Runner type alias
1 parent a46066c commit 6e53832

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

build_system/src/test.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,50 @@ use std::path::{Path, PathBuf};
1313
use std::str::FromStr;
1414

1515
type Env = HashMap<String, String>;
16-
type Runner = &'static dyn Fn(&Env, &TestArg) -> Result<(), String>;
16+
type Runner = fn(&Env, &TestArg) -> Result<(), String>;
1717
type Runners = HashMap<&'static str, (&'static str, Runner)>;
1818

1919
fn get_runners() -> Runners {
2020
let mut runners = HashMap::new();
2121

2222
runners.insert(
2323
"--test-rustc",
24-
("Run all rustc tests", &test_rustc as Runner),
24+
("Run all rustc tests", test_rustc as Runner),
2525
);
2626
runners.insert(
2727
"--test-successful-rustc",
28-
("Run successful rustc tests", &test_successful_rustc),
28+
("Run successful rustc tests", test_successful_rustc),
2929
);
3030
runners.insert(
3131
"--test-failing-rustc",
32-
("Run failing rustc tests", &test_failing_rustc),
32+
("Run failing rustc tests", test_failing_rustc),
3333
);
34-
runners.insert("--test-libcore", ("Run libcore tests", &test_libcore));
35-
runners.insert("--clean-ui-tests", ("Clean ui tests", &clean_ui_tests));
36-
runners.insert("--clean", ("Empty cargo target directory", &clean));
37-
runners.insert("--build-sysroot", ("Build sysroot", &build_sysroot));
38-
runners.insert("--std-tests", ("Run std tests", &std_tests));
39-
runners.insert("--asm-tests", ("Run asm tests", &asm_tests));
34+
runners.insert("--test-libcore", ("Run libcore tests", test_libcore));
35+
runners.insert("--clean-ui-tests", ("Clean ui tests", clean_ui_tests));
36+
runners.insert("--clean", ("Empty cargo target directory", clean));
37+
runners.insert("--build-sysroot", ("Build sysroot", build_sysroot));
38+
runners.insert("--std-tests", ("Run std tests", std_tests));
39+
runners.insert("--asm-tests", ("Run asm tests", asm_tests));
4040
runners.insert(
4141
"--extended-tests",
42-
("Run extended sysroot tests", &extended_sysroot_tests),
42+
("Run extended sysroot tests", extended_sysroot_tests),
4343
);
4444
runners.insert(
4545
"--extended-rand-tests",
46-
("Run extended rand tests", &extended_rand_tests),
46+
("Run extended rand tests", extended_rand_tests),
4747
);
4848
runners.insert(
4949
"--extended-regex-example-tests",
5050
(
5151
"Run extended regex example tests",
52-
&extended_regex_example_tests,
52+
extended_regex_example_tests,
5353
),
5454
);
5555
runners.insert(
5656
"--extended-regex-tests",
57-
("Run extended regex tests", &extended_regex_tests),
57+
("Run extended regex tests", extended_regex_tests),
5858
);
59-
runners.insert("--mini-tests", ("Run mini tests", &mini_tests));
59+
runners.insert("--mini-tests", ("Run mini tests", mini_tests));
6060

6161
runners
6262
}

0 commit comments

Comments
 (0)