auto merge of #12328 : nick29581/rust/abi, r=alexcrichton

2014-02-23 19:26:53 -08:00
parent 7cc6b5e0a3 317a253b22
commit 3c2650b4d5
19 changed files with 53 additions and 30 deletions
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -106,8 +106,8 @@ pub trait TDynBenchFn {
 // may need to come up with a more clever definition of test in order
 // to support isolation of tests into tasks.
 pub enum TestFn {
-    StaticTestFn(extern fn()),
-    StaticBenchFn(extern fn(&mut BenchHarness)),
+    StaticTestFn(fn()),
+    StaticBenchFn(fn(&mut BenchHarness)),
    StaticMetricFn(proc(&mut MetricMap)),
    DynTestFn(proc()),
    DynMetricFn(proc(&mut MetricMap)),