mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make a good error msg if you try to use an unsafe fn for a test

Browse source
This commit is contained in:
Niko Matsakis 2011-10-11 17:50:54 -07:00 • committed by Brian Anderson
parent b1a9d71218
commit 9f9deff7af
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/comp/driver/rustc.rs
View file

@ -110,7 +110,7 @@ fn compile_input(sess: session::session, cfg: ast::crate_cfg, input: str,
if sess.get_opts().test { if sess.get_opts().test {
crate = crate =
time(time_passes, "building test harness", time(time_passes, "building test harness",
bind front::test::modify_for_testing(crate)); bind front::test::modify_for_testing(sess, crate));
} }
crate = crate =
time(time_passes, "expansion", time(time_passes, "expansion",

27
src/comp/front/test.rs
View file

@ -7,6 +7,7 @@ import syntax::ast_util::*;
import syntax::fold; import syntax::fold;
import syntax::print::pprust; import syntax::print::pprust;
import syntax::codemap::span; import syntax::codemap::span;
import driver::session;
import front::attr; import front::attr;
export modify_for_testing; export modify_for_testing;
@ -16,13 +17,15 @@ type node_id_gen = fn() -> ast::node_id;
type test = {span: span, path: [ast::ident], ignore: bool}; type test = {span: span, path: [ast::ident], ignore: bool};
type test_ctxt = type test_ctxt =
@{next_node_id: node_id_gen, @{sess: session::session,
next_node_id: node_id_gen,
mutable path: [ast::ident], mutable path: [ast::ident],
mutable testfns: [test]}; mutable testfns: [test]};
// Traverse the crate, collecting all the test functions, eliding any // Traverse the crate, collecting all the test functions, eliding any
// existing main functions, and synthesizing a main test harness // existing main functions, and synthesizing a main test harness
fn modify_for_testing(crate: @ast::crate) -> @ast::crate { fn modify_for_testing(sess: session::session,
crate: @ast::crate) -> @ast::crate {
// FIXME: This hackasaurus assumes that 200000 is a safe number to start // FIXME: This hackasaurus assumes that 200000 is a safe number to start
// generating node_ids at (which is totally not the case). pauls is going // generating node_ids at (which is totally not the case). pauls is going
@ -37,7 +40,8 @@ fn modify_for_testing(crate: @ast::crate) -> @ast::crate {
}(next_node_id); }(next_node_id);
let cx: test_ctxt = let cx: test_ctxt =
@{next_node_id: next_node_id_fn, @{sess: sess,
next_node_id: next_node_id_fn,
mutable path: [], mutable path: [],
mutable testfns: []}; mutable testfns: []};
@ -90,10 +94,19 @@ fn fold_item(cx: test_ctxt, &&i: @ast::item, fld: fold::ast_fold) ->
log #fmt["current path: %s", ast_util::path_name_i(cx.path)]; log #fmt["current path: %s", ast_util::path_name_i(cx.path)];
if is_test_fn(i) { if is_test_fn(i) {
log "this is a test function"; alt i.node {
let test = {span: i.span, path: cx.path, ignore: is_ignored(i)}; ast::item_fn(f, _) when f.decl.purity == ast::unsafe_fn {
cx.testfns += [test]; cx.sess.span_fatal(
log #fmt["have %u test functions", vec::len(cx.testfns)]; i.span,
"unsafe functions cannot be used for tests");
}
_ {
log "this is a test function";
let test = {span: i.span, path: cx.path, ignore: is_ignored(i)};
cx.testfns += [test];
log #fmt["have %u test functions", vec::len(cx.testfns)];
}
}
} }
let res = fold::noop_fold_item(i, fld); let res = fold::noop_fold_item(i, fld);