Remove attr_parsing_unexpected_cfg_cargo_update because it is sadly no longer triggered

Author: JonathanBrouwer

compiler/rustc_attr_parsing/messages.ftl

@@ -223,7 +223,6 @@ attr_parsing_unexpected_cfg_add_build_rs_println = or consider adding `{$build_r
 attr_parsing_unexpected_cfg_add_cargo_feature = consider using a Cargo feature instead
 attr_parsing_unexpected_cfg_add_cargo_toml_lint_cfg = or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:{$cargo_toml_lint_cfg}
 attr_parsing_unexpected_cfg_add_cmdline_arg = to expect this configuration use `{$cmdline_arg}`
-attr_parsing_unexpected_cfg_cargo_update = the {$macro_kind} `{$macro_name}` may come from an old version of the `{$crate_name}` crate, try updating your dependency with `cargo update -p {$crate_name}`
 
 attr_parsing_unexpected_cfg_define_features = consider defining some features in `Cargo.toml`
 attr_parsing_unexpected_cfg_doc_cargo = see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration

compiler/rustc_attr_parsing/src/attributes/cfg/check_cfg.rs

@@ -1,6 +1,5 @@
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_middle::bug;
-use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
 use rustc_session::config::ExpectedValues;
 use rustc_span::edit_distance::find_best_match_for_name;
@@ -89,29 +88,20 @@ fn rustc_macro_help(span: Span) -> Option<lints::UnexpectedCfgRustcMacroHelp> {
     }
 }
 
-fn cargo_macro_help(
-    tcx: Option<TyCtxt<'_>>,
-    span: Span,
-) -> Option<lints::UnexpectedCfgCargoMacroHelp> {
+fn cargo_macro_help(span: Span) -> Option<lints::UnexpectedCfgCargoMacroHelp> {
     let oexpn = span.ctxt().outer_expn_data();
     if let Some(def_id) = oexpn.macro_def_id
         && let ExpnKind::Macro(macro_kind, macro_name) = oexpn.kind
         && def_id.krate != LOCAL_CRATE
-        && let Some(tcx) = tcx
     {
-        Some(lints::UnexpectedCfgCargoMacroHelp {
-            macro_kind: macro_kind.descr(),
-            macro_name,
-            crate_name: tcx.crate_name(def_id.krate),
-        })
+        Some(lints::UnexpectedCfgCargoMacroHelp { macro_kind: macro_kind.descr(), macro_name })
     } else {
         None
     }
 }
 
 pub fn unexpected_cfg_name(
     sess: &Session,
-    tcx: Option<TyCtxt<'_>>,
     (name, name_span): (Symbol, Span),
     value: Option<(Symbol, Span)>,
 ) -> lints::UnexpectedCfgName {
@@ -253,7 +243,7 @@ pub fn unexpected_cfg_name(
         };
         lints::unexpected_cfg_name::InvocationHelp::Cargo {
             help,
-            macro_help: cargo_macro_help(tcx, name_span),
+            macro_help: cargo_macro_help(name_span),
         }
     } else {
         let help = lints::UnexpectedCfgRustcHelp::new(&inst(EscapeQuotes::No));
@@ -268,7 +258,6 @@ pub fn unexpected_cfg_name(
 
 pub fn unexpected_cfg_value(
     sess: &Session,
-    tcx: Option<TyCtxt<'_>>,
     (name, name_span): (Symbol, Span),
     value: Option<(Symbol, Span)>,
 ) -> lints::UnexpectedCfgValue {
@@ -373,7 +362,7 @@ pub fn unexpected_cfg_value(
         };
         lints::unexpected_cfg_value::InvocationHelp::Cargo {
             help,
-            macro_help: cargo_macro_help(tcx, name_span),
+            macro_help: cargo_macro_help(name_span),
         }
     } else {
         let help = if can_suggest_adding_value {

compiler/rustc_attr_parsing/src/lints.rs

@@ -109,14 +109,14 @@ pub fn emit_attribute_lint<L: LintEmitter>(
                 rustc_session::lint::builtin::UNEXPECTED_CFGS,
                 *id,
                 *span,
-                unexpected_cfg_name(sess, None, (name, name_span), value),
+                unexpected_cfg_name(sess, (name, name_span), value),
             ),
         &AttributeLintKind::UnexpectedCfgValue { name, name_span, value } => lint_emitter
             .emit_node_span_lint(
                 rustc_session::lint::builtin::UNEXPECTED_CFGS,
                 *id,
                 *span,
-                unexpected_cfg_value(sess, None, (name, name_span), value),
+                unexpected_cfg_value(sess, (name, name_span), value),
             ),
     }
 }

compiler/rustc_attr_parsing/src/session_diagnostics.rs

@@ -1050,11 +1050,9 @@ pub struct UnexpectedCfgRustcMacroHelp {
 #[derive(Subdiagnostic)]
 #[note(attr_parsing_unexpected_cfg_from_external_macro_origin)]
 #[help(attr_parsing_unexpected_cfg_from_external_macro_refer)]
-#[help(attr_parsing_unexpected_cfg_cargo_update)]
 pub struct UnexpectedCfgCargoMacroHelp {
     pub macro_kind: &'static str,
     pub macro_name: Symbol,
-    pub crate_name: Symbol,
 }
 
 #[derive(LintDiagnostic)]

compiler/rustc_interface/src/passes.rs

@@ -94,7 +94,6 @@ fn pre_expansion_lint<'a>(
         || {
             rustc_lint::check_ast_node(
                 sess,
-                None,
                 features,
                 true,
                 lint_store,
@@ -470,7 +469,6 @@ fn early_lint_checks(tcx: TyCtxt<'_>, (): ()) {
     let lint_store = unerased_lint_store(tcx.sess);
     rustc_lint::check_ast_node(
         sess,
-        Some(tcx),
         tcx.features(),
         false,
         lint_store,

compiler/rustc_lint/src/early.rs

@@ -9,7 +9,7 @@ use rustc_ast::{self as ast, HasAttrs};
 use rustc_data_structures::stack::ensure_sufficient_stack;
 use rustc_errors::{BufferedEarlyLint, DecorateDiagCompat, LintBuffer};
 use rustc_feature::Features;
-use rustc_middle::ty::{RegisteredTools, TyCtxt};
+use rustc_middle::ty::RegisteredTools;
 use rustc_session::Session;
 use rustc_session::lint::LintPass;
 use rustc_span::{Ident, Span};
@@ -26,20 +26,19 @@ macro_rules! lint_callback { ($cx:expr, $f:ident, $($args:expr),*) => ({
 
 /// Implements the AST traversal for early lint passes. `T` provides the
 /// `check_*` methods.
-pub struct EarlyContextAndPass<'ecx, 'tcx, T: EarlyLintPass> {
+pub struct EarlyContextAndPass<'ecx, T: EarlyLintPass> {
     context: EarlyContext<'ecx>,
-    tcx: Option<TyCtxt<'tcx>>,
     pass: T,
 }
 
-impl<'ecx, 'tcx, T: EarlyLintPass> EarlyContextAndPass<'ecx, 'tcx, T> {
+impl<'ecx, T: EarlyLintPass> EarlyContextAndPass<'ecx, T> {
     #[allow(rustc::diagnostic_outside_of_impl)]
     fn check_id(&mut self, id: ast::NodeId) {
         for early_lint in self.context.buffered.take(id) {
             let BufferedEarlyLint { span, node_id: _, lint_id, diagnostic } = early_lint;
             self.context.opt_span_lint(lint_id.lint, span, |diag| match diagnostic {
                 DecorateDiagCompat::Builtin(b) => {
-                    diagnostics::decorate_builtin_lint(self.context.sess(), self.tcx, b, diag);
+                    diagnostics::decorate_builtin_lint(self.context.sess(), b, diag);
                 }
                 DecorateDiagCompat::Dynamic(d) => d.decorate_lint_box(diag),
             });
@@ -66,9 +65,7 @@ impl<'ecx, 'tcx, T: EarlyLintPass> EarlyContextAndPass<'ecx, 'tcx, T> {
     }
 }
 
-impl<'ast, 'ecx, 'tcx, T: EarlyLintPass> ast_visit::Visitor<'ast>
-    for EarlyContextAndPass<'ecx, 'tcx, T>
-{
+impl<'ast, 'ecx, T: EarlyLintPass> ast_visit::Visitor<'ast> for EarlyContextAndPass<'ecx, T> {
     fn visit_id(&mut self, id: rustc_ast::NodeId) {
         self.check_id(id);
     }
@@ -283,7 +280,7 @@ crate::early_lint_methods!(impl_early_lint_pass, []);
 pub trait EarlyCheckNode<'a>: Copy {
     fn id(self) -> ast::NodeId;
     fn attrs(self) -> &'a [ast::Attribute];
-    fn check<'ecx, 'tcx, T: EarlyLintPass>(self, cx: &mut EarlyContextAndPass<'ecx, 'tcx, T>);
+    fn check<'ecx, T: EarlyLintPass>(self, cx: &mut EarlyContextAndPass<'ecx, T>);
 }
 
 impl<'a> EarlyCheckNode<'a> for (&'a ast::Crate, &'a [ast::Attribute]) {
@@ -293,7 +290,7 @@ impl<'a> EarlyCheckNode<'a> for (&'a ast::Crate, &'a [ast::Attribute]) {
     fn attrs(self) -> &'a [ast::Attribute] {
         self.1
     }
-    fn check<'ecx, 'tcx, T: EarlyLintPass>(self, cx: &mut EarlyContextAndPass<'ecx, 'tcx, T>) {
+    fn check<'ecx, T: EarlyLintPass>(self, cx: &mut EarlyContextAndPass<'ecx, T>) {
         lint_callback!(cx, check_crate, self.0);
         ast_visit::walk_crate(cx, self.0);
         lint_callback!(cx, check_crate_post, self.0);
@@ -307,15 +304,14 @@ impl<'a> EarlyCheckNode<'a> for (ast::NodeId, &'a [ast::Attribute], &'a [Box<ast
     fn attrs(self) -> &'a [ast::Attribute] {
         self.1
     }
-    fn check<'ecx, 'tcx, T: EarlyLintPass>(self, cx: &mut EarlyContextAndPass<'ecx, 'tcx, T>) {
+    fn check<'ecx, T: EarlyLintPass>(self, cx: &mut EarlyContextAndPass<'ecx, T>) {
         walk_list!(cx, visit_attribute, self.1);
         walk_list!(cx, visit_item, self.2);
     }
 }
 
 pub fn check_ast_node<'a>(
     sess: &Session,
-    tcx: Option<TyCtxt<'_>>,
     features: &Features,
     pre_expansion: bool,
     lint_store: &LintStore,
@@ -339,23 +335,22 @@ pub fn check_ast_node<'a>(
     let passes =
         if pre_expansion { &lint_store.pre_expansion_passes } else { &lint_store.early_passes };
     if passes.is_empty() {
-        check_ast_node_inner(sess, tcx, check_node, context, builtin_lints);
+        check_ast_node_inner(sess, check_node, context, builtin_lints);
     } else {
         let mut passes: Vec<_> = passes.iter().map(|mk_pass| (mk_pass)()).collect();
         passes.push(Box::new(builtin_lints));
         let pass = RuntimeCombinedEarlyLintPass { passes: &mut passes[..] };
-        check_ast_node_inner(sess, tcx, check_node, context, pass);
+        check_ast_node_inner(sess, check_node, context, pass);
     }
 }
 
 fn check_ast_node_inner<'a, T: EarlyLintPass>(
     sess: &Session,
-    tcx: Option<TyCtxt<'_>>,
     check_node: impl EarlyCheckNode<'a>,
     context: EarlyContext<'_>,
     pass: T,
 ) {
-    let mut cx = EarlyContextAndPass { context, tcx, pass };
+    let mut cx = EarlyContextAndPass { context, pass };
 
     cx.with_lint_attrs(check_node.id(), check_node.attrs(), |cx| check_node.check(cx));
 

compiler/rustc_lint/src/early/diagnostics.rs

@@ -5,20 +5,14 @@ use rustc_errors::{
     Applicability, Diag, DiagArgValue, LintDiagnostic, elided_lifetime_in_path_suggestion,
 };
 use rustc_middle::middle::stability;
-use rustc_middle::ty::TyCtxt;
 use rustc_session::Session;
 use rustc_session::lint::BuiltinLintDiag;
 use rustc_span::BytePos;
 use tracing::debug;
 
 use crate::lints;
 
-pub fn decorate_builtin_lint(
-    sess: &Session,
-    tcx: Option<TyCtxt<'_>>,
-    diagnostic: BuiltinLintDiag,
-    diag: &mut Diag<'_, ()>,
-) {
+pub fn decorate_builtin_lint(sess: &Session, diagnostic: BuiltinLintDiag, diag: &mut Diag<'_, ()>) {
     match diagnostic {
         BuiltinLintDiag::UnicodeTextFlow(comment_span, content) => {
             let spans: Vec<_> = content
@@ -167,10 +161,10 @@ pub fn decorate_builtin_lint(
             .decorate_lint(diag);
         }
         BuiltinLintDiag::UnexpectedCfgName(name, value) => {
-            rustc_attr_parsing::unexpected_cfg_name(sess, tcx, name, value).decorate_lint(diag);
+            rustc_attr_parsing::unexpected_cfg_name(sess, name, value).decorate_lint(diag);
         }
         BuiltinLintDiag::UnexpectedCfgValue(name, value) => {
-            rustc_attr_parsing::unexpected_cfg_value(sess, tcx, name, value).decorate_lint(diag);
+            rustc_attr_parsing::unexpected_cfg_value(sess, name, value).decorate_lint(diag);
         }
         BuiltinLintDiag::DeprecatedWhereclauseLocation(left_sp, sugg) => {
             let suggestion = match sugg {

tests/ui/check-cfg/report-in-external-macros.cargo.stderr

@@ -7,7 +7,6 @@ LL |     cfg_macro::my_lib_macro!();
    = help: expected names are: `feature` and 31 more
    = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
    = help: try referring to `cfg_macro::my_lib_macro` crate for guidance on how handle this unexpected cfg
-   = help: the macro `cfg_macro::my_lib_macro` may come from an old version of the `cfg_macro` crate, try updating your dependency with `cargo update -p cfg_macro`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
    = note: `#[warn(unexpected_cfgs)]` on by default
    = note: this warning originates in the macro `cfg_macro::my_lib_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -21,7 +20,6 @@ LL |     cfg_macro::my_lib_macro_value!();
    = note: expected values for `panic` are: `abort`, `immediate-abort`, and `unwind`
    = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
    = help: try referring to `cfg_macro::my_lib_macro_value` crate for guidance on how handle this unexpected cfg
-   = help: the macro `cfg_macro::my_lib_macro_value` may come from an old version of the `cfg_macro` crate, try updating your dependency with `cargo update -p cfg_macro`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
    = note: this warning originates in the macro `cfg_macro::my_lib_macro_value` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -34,7 +32,6 @@ LL |     cfg_macro::my_lib_macro_feature!();
    = note: no expected values for `feature`
    = note: using a cfg inside a macro will use the cfgs from the destination crate and not the ones from the defining crate
    = help: try referring to `cfg_macro::my_lib_macro_feature` crate for guidance on how handle this unexpected cfg
-   = help: the macro `cfg_macro::my_lib_macro_feature` may come from an old version of the `cfg_macro` crate, try updating your dependency with `cargo update -p cfg_macro`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
    = note: this warning originates in the macro `cfg_macro::my_lib_macro_feature` (in Nightly builds, run with -Z macro-backtrace for more info)