diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-07-28 16:20:10 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-07-28 20:33:06 +0530 |
| commit | f540f5d4537a0b417986dfc529ab188e3451d9fd (patch) | |
| tree | ed5fccc2bdc1980f8a75e754c0d44d96a3dce11f /src/libsyntax | |
| parent | 43bcada39709ed9ebbd1b847db87c639b2eaf17c (diff) | |
| parent | 64d36ccf96c8562a88f5fba75618a9c74fa06daf (diff) | |
| download | rust-f540f5d4537a0b417986dfc529ab188e3451d9fd.tar.gz rust-f540f5d4537a0b417986dfc529ab188e3451d9fd.zip | |
Rollup merge of #34969 - jseyfried:fix_cfg_feature, r=nrc
Avoid processing `feature`s on unconfigured crates Fixes #34932, a regression caused by #34272. r? @nrc
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/config.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs index ff75149f518..a825cf866a8 100644 --- a/src/libsyntax/config.rs +++ b/src/libsyntax/config.rs @@ -124,7 +124,7 @@ pub fn strip_unconfigured_items(mut krate: ast::Crate, sess: &ParseSess, should_ }; let err_count = sess.span_diagnostic.err_count(); - let krate_attrs = strip_unconfigured.process_cfg_attrs(krate.attrs.clone()); + let krate_attrs = strip_unconfigured.configure(krate.attrs.clone()).unwrap_or_default(); features = get_features(&sess.span_diagnostic, &krate_attrs); if err_count < sess.span_diagnostic.err_count() { krate.attrs = krate_attrs.clone(); // Avoid reconfiguring malformed `cfg_attr`s |