bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Always evaluate all cfg predicate in all() and any()

Browse source
This commit is contained in:
Loïc BRANSTETT 2022-02-23 15:44:57 +01:00
parent cb4ee81ef5
commit f57cc8ca5c
3 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_attr/src/builtin.rs
View file

@ -594,10 +594,18 @@ pub fn eval_condition(
match cfg.name_or_empty() {
sym::any => mis
.iter()
.any(|mi| eval_condition(mi.meta_item().unwrap(), sess, features, eval)),
// We don't use any() here, because we want to evaluate all cfg condition
// as eval_condition can (and does) extra checks
.fold(false, |res, mi| {
res | eval_condition(mi.meta_item().unwrap(), sess, features, eval)
}),
sym::all => mis
.iter()
.all(|mi| eval_condition(mi.meta_item().unwrap(), sess, features, eval)),
// We don't use all() here, because we want to evaluate all cfg condition
// as eval_condition can (and does) extra checks
.fold(true, |res, mi| {
res & eval_condition(mi.meta_item().unwrap(), sess, features, eval)
}),
sym::not => {
if mis.len() != 1 {
struct_span_err!(