Make rustc_attr_parsing::eval_config_entry take impl CfgMatchesLintEmitter instead of NodeId

Author: GuillaumeGomez

compiler/rustc_attr_parsing/src/attributes/cfg.rs

@@ -1,6 +1,6 @@
 use rustc_ast::token::Delimiter;
 use rustc_ast::tokenstream::DelimSpan;
-use rustc_ast::{AttrItem, Attribute, CRATE_NODE_ID, LitKind, NodeId, ast, token};
+use rustc_ast::{AttrItem, Attribute, CRATE_NODE_ID, LitKind, ast, token};
 use rustc_errors::{Applicability, PResult};
 use rustc_feature::{AttrSuggestionStyle, AttributeTemplate, Features, template};
 use rustc_hir::attrs::CfgEntry;
@@ -199,14 +199,14 @@ pub(crate) fn parse_name_value<S: Stage>(
 pub fn eval_config_entry(
     sess: &Session,
     cfg_entry: &CfgEntry,
-    id: NodeId,
+    lint_emitter: &impl CfgMatchesLintEmitter,
     emit_lints: ShouldEmit,
 ) -> EvalConfigResult {
     match cfg_entry {
         CfgEntry::All(subs, ..) => {
             let mut all = None;
             for sub in subs {
-                let res = eval_config_entry(sess, sub, id, emit_lints);
+                let res = eval_config_entry(sess, sub, lint_emitter, emit_lints);
                 // We cannot short-circuit because `eval_config_entry` emits some lints
                 if !res.as_bool() {
                     all.get_or_insert(res);
@@ -217,7 +217,7 @@ pub fn eval_config_entry(
         CfgEntry::Any(subs, span) => {
             let mut any = None;
             for sub in subs {
-                let res = eval_config_entry(sess, sub, id, emit_lints);
+                let res = eval_config_entry(sess, sub, lint_emitter, emit_lints);
                 // We cannot short-circuit because `eval_config_entry` emits some lints
                 if res.as_bool() {
                     any.get_or_insert(res);
@@ -229,7 +229,7 @@ pub fn eval_config_entry(
             })
         }
         CfgEntry::Not(sub, span) => {
-            if eval_config_entry(sess, sub, id, emit_lints).as_bool() {
+            if eval_config_entry(sess, sub, lint_emitter, emit_lints).as_bool() {
                 EvalConfigResult::False { reason: cfg_entry.clone(), reason_span: *span }
             } else {
                 EvalConfigResult::True
@@ -248,15 +248,15 @@ pub fn eval_config_entry(
                     Some(ExpectedValues::Some(values))
                         if !values.contains(&value.map(|(v, _)| v)) =>
                     {
-                        id.emit_span_lint(
+                        lint_emitter.emit_span_lint(
                             sess,
                             UNEXPECTED_CFGS,
                             *span,
                             BuiltinLintDiag::UnexpectedCfgValue((*name, *name_span), *value),
                         );
                     }
                     None if sess.psess.check_config.exhaustive_names => {
-                        id.emit_span_lint(
+                        lint_emitter.emit_span_lint(
                             sess,
                             UNEXPECTED_CFGS,
                             *span,

compiler/rustc_builtin_macros/src/cfg.rs

@@ -29,7 +29,7 @@ pub(crate) fn expand_cfg(
             let matches_cfg = attr::eval_config_entry(
                 cx.sess,
                 &cfg,
-                cx.current_expansion.lint_node_id,
+                &cx.current_expansion.lint_node_id,
                 ShouldEmit::ErrorsAndLints,
             )
             .as_bool();

compiler/rustc_builtin_macros/src/cfg_select.rs

@@ -15,7 +15,7 @@ fn select_arm(ecx: &ExtCtxt<'_>, branches: CfgSelectBranches) -> Option<(TokenSt
         if let EvalConfigResult::True = attr::eval_config_entry(
             &ecx.sess,
             &cfg,
-            ecx.current_expansion.lint_node_id,
+            &ecx.current_expansion.lint_node_id,
             ShouldEmit::ErrorsAndLints,
         ) {
             // FIXME(#149215) Ideally we should short-circuit here, but `eval_config_entry` currently emits lints so we cannot do this yet.

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -3030,7 +3030,7 @@ fn add_dynamic_crate(cmd: &mut dyn Linker, sess: &Session, cratepath: &Path) {
 fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool {
     match lib.cfg {
         Some(ref cfg) => {
-            eval_config_entry(sess, cfg, CRATE_NODE_ID, ShouldEmit::ErrorsAndLints).as_bool()
+            eval_config_entry(sess, cfg, &CRATE_NODE_ID, ShouldEmit::ErrorsAndLints).as_bool()
         }
         None => true,
     }

compiler/rustc_expand/src/config.rs

@@ -321,7 +321,7 @@ impl<'a> StripUnconfigured<'a> {
         if !attr::eval_config_entry(
             self.sess,
             &cfg_predicate,
-            ast::CRATE_NODE_ID,
+            &ast::CRATE_NODE_ID,
             ShouldEmit::ErrorsAndLints,
         )
         .as_bool()
@@ -442,7 +442,7 @@ impl<'a> StripUnconfigured<'a> {
             return EvalConfigResult::True;
         };
 
-        eval_config_entry(self.sess, &cfg, self.lint_node_id, emit_errors)
+        eval_config_entry(self.sess, &cfg, &self.lint_node_id, emit_errors)
     }
 
     /// If attributes are not allowed on expressions, emit an error for `attr`

compiler/rustc_metadata/src/native_libs.rs

@@ -189,7 +189,7 @@ pub(crate) fn collect(tcx: TyCtxt<'_>, LocalCrate: LocalCrate) -> Vec<NativeLib>
 pub(crate) fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool {
     match lib.cfg {
         Some(ref cfg) => {
-            eval_config_entry(sess, cfg, CRATE_NODE_ID, ShouldEmit::ErrorsAndLints).as_bool()
+            eval_config_entry(sess, cfg, &CRATE_NODE_ID, ShouldEmit::ErrorsAndLints).as_bool()
         }
         None => true,
     }