Refactor how lints define future incompatibility

compiler/rustc_lint/src/builtin.rs

@@ -32,7 +32,7 @@ use rustc_hir::intravisit::FnKind as HirFnKind;
 use rustc_hir::{self as hir, Body, FnDecl, ImplItemImplKind, PatKind, PredicateOrigin};
 // Lints from rustc_lint_defs
 pub use rustc_lint_defs::builtin::*;
-use rustc_lint_defs::{declare_lint, declare_lint_pass, fcw, impl_lint_pass};
+use rustc_lint_defs::{ReportInDeps, declare_lint, declare_lint_pass, impl_lint_pass};
 use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::print::with_no_trimmed_paths;
@@ -702,9 +702,7 @@ declare_lint! {
     pub ANONYMOUS_PARAMETERS,
     Warn,
     "detects anonymous parameters",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionError 2018 "trait-fn-parameters"),
-    };
+    @future_incompatible = edition_error(2018, "trait-fn-parameters");
 }
 
 declare_lint_pass!(
@@ -1553,9 +1551,7 @@ declare_lint! {
     pub ELLIPSIS_INCLUSIVE_RANGE_PATTERNS,
     Warn,
     "`...` range patterns are deprecated",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionError 2021 "warnings-promoted-to-error"),
-    };
+    @future_incompatible = edition_error(2021, "warnings-promoted-to-error");
 }
 
 #[derive(Default)]
@@ -1688,9 +1684,7 @@ declare_lint! {
     pub KEYWORD_IDENTS_2018,
     Allow,
     "detects edition keywords being used as an identifier",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionError 2018 "new-keywords"),
-    };
+    @future_incompatible = edition_error(2018, "new-keywords");
 }
 
 declare_lint! {
@@ -1732,9 +1726,7 @@ declare_lint! {
     pub KEYWORD_IDENTS_2024,
     Allow,
     "detects edition keywords being used as an identifier",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionError 2024 "gen-keyword"),
-    };
+    @future_incompatible = edition_error(2024, "gen-keyword");
 }
 
 declare_lint_pass!(
@@ -3151,10 +3143,7 @@ declare_lint! {
     pub INTERNAL_EQ_TRAIT_METHOD_IMPLS,
     Warn,
     "manual implementation of the internal `Eq::assert_receiver_is_total_eq` method",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(FutureReleaseError #152336),
-        report_in_deps: false,
-    };
+    @future_incompatible = future_release_error(152336, ReportInDeps::No);
 }
 
 declare_lint_pass!(InternalEqTraitMethodImpls => [INTERNAL_EQ_TRAIT_METHOD_IMPLS]);

compiler/rustc_lint/src/if_let_rescope.rs

@@ -5,7 +5,7 @@ use hir::intravisit::{self, Visitor};
 use rustc_ast::Recovered;
 use rustc_errors::{Applicability, Diag, Subdiagnostic, SuggestionStyle, msg};
 use rustc_hir::{self as hir, HirIdSet};
-use rustc_lint_defs::{LintId, declare_lint, fcw, impl_lint_pass};
+use rustc_lint_defs::{LintId, declare_lint, impl_lint_pass};
 use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_middle::ty::adjustment::Adjust;
 use rustc_middle::ty::significant_drop_order::{
@@ -83,9 +83,7 @@ declare_lint! {
     Allow,
     "`if let` assigns a shorter lifetime to temporary values being pattern-matched against in Edition 2024 and \
     rewriting in `match` is an option to preserve the semantics up to Edition 2021",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionSemanticsChange 2024 "temporary-if-let-scope"),
-    };
+    @future_incompatible = edition_semantics_change(2024, "temporary-if-let-scope");
 }
 
 /// Lint for potential change in program semantics of `if let`s

compiler/rustc_lint/src/impl_trait_overcaptures.rs

@@ -9,7 +9,7 @@ use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId, LocalDefId};
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_infer::infer::outlives::env::OutlivesEnvironment;
-use rustc_lint_defs::{declare_lint, declare_lint_pass, fcw};
+use rustc_lint_defs::{declare_lint, declare_lint_pass};
 use rustc_macros::Diagnostic;
 use rustc_middle::middle::resolve_bound_vars::ResolvedArg;
 use rustc_middle::ty::relate::{
@@ -68,9 +68,7 @@ declare_lint! {
     pub IMPL_TRAIT_OVERCAPTURES,
     Allow,
     "`impl Trait` will capture more lifetimes than possibly intended in edition 2024",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionSemanticsChange 2024 "rpit-lifetime-capture"),
-    };
+    @future_incompatible = edition_semantics_change(2024, "rpit-lifetime-capture");
 }
 
 declare_lint! {

compiler/rustc_lint/src/levels.rs

@@ -16,7 +16,8 @@ use rustc_lint_defs::builtin::{
     UNFULFILLED_LINT_EXPECTATIONS, UNKNOWN_LINTS, UNUSED_ATTRIBUTES,
 };
 use rustc_lint_defs::{
-    Level, Lint, LintExpectationId, LintId, StableLintExpectationId, UnstableLintExpectationId,
+    Level, Lint, LintExpectationId, LintId, ReportInDeps, StableLintExpectationId,
+    UnstableLintExpectationId,
 };
 use rustc_middle::hir::nested_filter;
 use rustc_middle::lint::{
@@ -121,8 +122,9 @@ fn skippable_lints(tcx: TyCtxt<'_>, (): ()) -> UnordSet<LintId> {
         .into_iter()
         .filter(|lint| {
             // Lints that show up in future-compat reports must always be run.
-            let has_future_breakage =
-                lint.future_incompatible.is_some_and(|fut| fut.report_in_deps);
+            let has_future_breakage = lint
+                .future_incompatible
+                .is_some_and(|fut| matches!(fut.reason.report_in_deps(), ReportInDeps::Yes));
             !has_future_breakage && !lint.eval_always
         })
         .filter(|lint| {

compiler/rustc_lint/src/macro_expr_fragment_specifier_2024_migration.rs

@@ -2,7 +2,7 @@
 
 use rustc_ast::token::{Token, TokenKind};
 use rustc_ast::tokenstream::{TokenStream, TokenTree};
-use rustc_lint_defs::{declare_lint, declare_lint_pass, fcw};
+use rustc_lint_defs::{declare_lint, declare_lint_pass};
 use rustc_span::edition::Edition;
 use rustc_span::sym;
 use tracing::debug;
@@ -70,9 +70,7 @@ declare_lint! {
     Allow,
     "The `expr` fragment specifier will accept more expressions in the 2024 edition. \
     To keep the existing behavior, use the `expr_2021` fragment specifier.",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionSemanticsChange 2024 "macro-fragment-specifiers"),
-    };
+    @future_incompatible = edition_semantics_change(2024, "macro-fragment-specifiers");
 }
 
 declare_lint_pass!(Expr2024 => [EDITION_2024_EXPR_FRAGMENT_SPECIFIER,]);

compiler/rustc_lint/src/non_fmt_panic.rs

@@ -4,7 +4,7 @@ use rustc_errors::{Applicability, Diag, DiagCtxtHandle, Diagnostic, Level, msg};
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_infer::infer::TyCtxtInferExt;
-use rustc_lint_defs::{declare_lint, declare_lint_pass, fcw};
+use rustc_lint_defs::{declare_lint, declare_lint_pass};
 use rustc_middle::ty;
 use rustc_parse_format::{ParseMode, Parser, Piece};
 use rustc_span::{InnerSpan, Span, Symbol, bug, hygiene, sym};
@@ -37,10 +37,7 @@ declare_lint! {
     NON_FMT_PANICS,
     Warn,
     "detect single-argument panic!() invocations in which the argument is not a format string",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionSemanticsChange 2021 "panic-macro-consistency"),
-        explain_reason: false,
-    };
+    @future_incompatible = edition_semantics_change(2021, "panic-macro-consistency").dont_explain_reason();
     report_in_external_macro
 }
 

compiler/rustc_lint/src/shadowed_into_iter.rs

@@ -1,6 +1,6 @@
 use rustc_attr_ir::lang_items::LangItem;
 use rustc_hir as hir;
-use rustc_lint_defs::{declare_lint, fcw, impl_lint_pass};
+use rustc_lint_defs::{declare_lint, impl_lint_pass};
 use rustc_middle::ty::{self, Ty};
 
 use crate::diagnostics::{ShadowedIntoIterDiag, ShadowedIntoIterDiagSub};
@@ -29,9 +29,7 @@ declare_lint! {
     pub ARRAY_INTO_ITER,
     Warn,
     "detects calling `into_iter` on arrays in Rust 2015 and 2018",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionSemanticsChange 2021 "IntoIterator-for-arrays"),
-    };
+    @future_incompatible = edition_semantics_change(2021, "IntoIterator-for-arrays");
 }
 
 declare_lint! {
@@ -57,9 +55,7 @@ declare_lint! {
     pub BOXED_SLICE_INTO_ITER,
     Warn,
     "detects calling `into_iter` on boxed slices in Rust 2015, 2018, and 2021",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionSemanticsChange 2024 "intoiterator-box-slice"),
-    };
+    @future_incompatible = edition_semantics_change(2024, "intoiterator-box-slice");
 }
 
 #[derive(Copy, Clone)]

compiler/rustc_lint/src/static_mut_refs.rs

@@ -1,7 +1,7 @@
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::{Expr, Stmt};
-use rustc_lint_defs::{declare_lint, declare_lint_pass, fcw};
+use rustc_lint_defs::{declare_lint, declare_lint_pass};
 use rustc_middle::ty::{Mutability, TyKind};
 use rustc_span::{BytePos, Span};
 
@@ -51,10 +51,7 @@ declare_lint! {
     pub STATIC_MUT_REFS,
     Warn,
     "creating a shared reference to mutable static",
-    @future_incompatible = FutureIncompatibleInfo {
-        reason: fcw!(EditionError 2024 "static-mut-references"),
-        explain_reason: false,
-    };
+    @future_incompatible = edition_error(2024, "static-mut-references").dont_explain_reason();
     @edition Edition2024 => Deny;
 }