user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid gated feature checking unconfigured items

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-04-08 22:47:55 +00:00
parent 7979dd6089
commit 0ea66f35a9
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/librustc_driver/driver.rs
View file

@ -625,21 +625,6 @@ pub fn phase_2_configure_and_expand(sess: &Session,
ret
});
// Needs to go *after* expansion to be able to check the results
// of macro expansion. This runs before #[cfg] to try to catch as
// much as possible (e.g. help the programmer avoid platform
// specific differences)
time(time_passes, "complete gated feature checking 1", || {
sess.track_errors(|| {
let features = syntax::feature_gate::check_crate(sess.codemap(),
&sess.parse_sess.span_diagnostic,
&krate,
&attributes,
sess.opts.unstable_features);
*sess.features.borrow_mut() = features;
})
})?;
// JBC: make CFG processing part of expansion to avoid this problem:
// strip again, in case expansion added anything with a #[cfg].
@ -662,6 +647,19 @@ pub fn phase_2_configure_and_expand(sess: &Session,
krate
})?;
// Needs to go *after* expansion to be able to check the results
// of macro expansion.
time(time_passes, "complete gated feature checking 1", || {
sess.track_errors(|| {
let features = syntax::feature_gate::check_crate(sess.codemap(),
&sess.parse_sess.span_diagnostic,
&krate,
&attributes,
sess.opts.unstable_features);
*sess.features.borrow_mut() = features;
})
})?;
krate = time(time_passes, "maybe building test harness", || {
syntax::test::modify_for_testing(&sess.parse_sess, &sess.opts.cfg, krate, sess.diagnostic())
});