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

Strip unconfigured items during macro expansion

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-05-16 10:09:23 +00:00
parent 25c733360b
commit 1aa34e0b5f
3 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_driver/driver.rs
View file

@ -720,16 +720,7 @@ pub fn phase_2_configure_and_expand(sess: &Session,
ret
});
// JBC: make CFG processing part of expansion to avoid this problem:
// strip again, in case expansion added anything with a #[cfg].
krate = sess.track_errors(|| {
let krate = time(time_passes, "configuration 2", || {
syntax::config::strip_unconfigured_items(sess.diagnostic(),
krate,
&mut feature_gated_cfgs)
});
time(time_passes, "gated configuration checking", || {
let features = sess.features.borrow();
feature_gated_cfgs.sort();