Rollup merge of #148688 - JonathanBrouwer:remove_features, r=jdonszelmann

Remove unused argument `features` from `eval_config_entry`

Author: Zalathar

compiler/rustc_attr_parsing/src/attributes/cfg.rs

@@ -199,14 +199,13 @@ pub fn eval_config_entry(
     sess: &Session,
     cfg_entry: &CfgEntry,
     id: NodeId,
-    features: Option<&Features>,
     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, features, emit_lints);
+                let res = eval_config_entry(sess, sub, id, emit_lints);
                 // We cannot short-circuit because `eval_config_entry` emits some lints
                 if !res.as_bool() {
                     all.get_or_insert(res);
@@ -217,7 +216,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, features, emit_lints);
+                let res = eval_config_entry(sess, sub, id, emit_lints);
                 // We cannot short-circuit because `eval_config_entry` emits some lints
                 if res.as_bool() {
                     any.get_or_insert(res);
@@ -229,7 +228,7 @@ pub fn eval_config_entry(
             })
         }
         CfgEntry::Not(sub, span) => {
-            if eval_config_entry(sess, sub, id, features, emit_lints).as_bool() {
+            if eval_config_entry(sess, sub, id, emit_lints).as_bool() {
                 EvalConfigResult::False { reason: cfg_entry.clone(), reason_span: *span }
             } else {
                 EvalConfigResult::True

compiler/rustc_builtin_macros/src/cfg.rs

@@ -30,7 +30,6 @@ pub(crate) fn expand_cfg(
                 cx.sess,
                 &cfg,
                 cx.current_expansion.lint_node_id,
-                Some(cx.ecfg.features),
                 ShouldEmit::ErrorsAndLints,
             )
             .as_bool();

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -3036,7 +3036,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, None, ShouldEmit::ErrorsAndLints).as_bool()
+            eval_config_entry(sess, cfg, CRATE_NODE_ID, ShouldEmit::ErrorsAndLints).as_bool()
         }
         None => true,
     }

compiler/rustc_expand/src/config.rs

@@ -322,7 +322,6 @@ impl<'a> StripUnconfigured<'a> {
             self.sess,
             &cfg_predicate,
             ast::CRATE_NODE_ID,
-            self.features,
             ShouldEmit::ErrorsAndLints,
         )
         .as_bool()
@@ -443,7 +442,7 @@ impl<'a> StripUnconfigured<'a> {
             return EvalConfigResult::True;
         };
 
-        eval_config_entry(self.sess, &cfg, self.lint_node_id, self.features, 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, None, ShouldEmit::ErrorsAndLints).as_bool()
+            eval_config_entry(sess, cfg, CRATE_NODE_ID, ShouldEmit::ErrorsAndLints).as_bool()
         }
         None => true,
     }