From ea5c413427553507698a3358488199fcb00ca1ce Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Thu, 9 May 2013 15:15:54 +1000 Subject: [PATCH] Perform expansion before stripping/building a test harness. This allows macros to create tests and benchmarks. --- src/librustc/driver/driver.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index 5bda6daa69b9..01a68255c3ea 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -183,16 +183,16 @@ pub fn compile_rest(sess: Session, *sess.building_library = session::building_library( sess.opts.crate_type, crate, sess.opts.test); + crate = time(time_passes, ~"expansion", || + syntax::ext::expand::expand_crate(sess.parse_sess, copy cfg, + crate)); + crate = time(time_passes, ~"configuration", || front::config::strip_unconfigured_items(crate)); crate = time(time_passes, ~"maybe building test harness", || front::test::modify_for_testing(sess, crate)); - crate = time(time_passes, ~"expansion", || - syntax::ext::expand::expand_crate(sess.parse_sess, copy cfg, - crate)); - if upto == cu_expand { return (crate, None); } crate = time(time_passes, ~"intrinsic injection", ||