Migrate rustc_mir_transform to use TyCtxt::emit_diag_node_span_lint

GuillaumeGomez · GuillaumeGomez · commit 480aa4d87e81 · 2026-02-24T20:12:42.000+01:00
diff --git a/compiler/rustc_mir_transform/src/check_call_recursion.rs b/compiler/rustc_mir_transform/src/check_call_recursion.rs
@@ -83,7 +83,7 @@ fn check_recursion<'tcx>(
 
         let sp = tcx.def_span(def_id);
         let hir_id = tcx.local_def_id_to_hir_id(def_id);
-        tcx.emit_node_span_lint(
+        tcx.emit_diag_node_span_lint(
             UNCONDITIONAL_RECURSION,
             hir_id,
             sp,
diff --git a/compiler/rustc_mir_transform/src/check_const_item_mutation.rs b/compiler/rustc_mir_transform/src/check_const_item_mutation.rs
@@ -104,7 +104,7 @@ impl<'tcx> Visitor<'tcx> for ConstMutationChecker<'_, 'tcx> {
                 && let Some((lint_root, span, item)) =
                     self.should_lint_const_item_usage(lhs, def_id, loc)
             {
-                self.tcx.emit_node_span_lint(
+                self.tcx.emit_diag_node_span_lint(
                     CONST_ITEM_MUTATION,
                     lint_root,
                     span,
@@ -150,7 +150,7 @@ impl<'tcx> Visitor<'tcx> for ConstMutationChecker<'_, 'tcx> {
                 if let Some((lint_root, span, item)) =
                     self.should_lint_const_item_usage(place, def_id, lint_loc)
                 {
-                    self.tcx.emit_node_span_lint(
+                    self.tcx.emit_diag_node_span_lint(
                         CONST_ITEM_MUTATION,
                         lint_root,
                         span,
diff --git a/compiler/rustc_mir_transform/src/coroutine.rs b/compiler/rustc_mir_transform/src/coroutine.rs
@@ -1990,7 +1990,7 @@ fn check_must_not_suspend_def(
     if let Some(reason_str) = find_attr!(tcx, def_id, MustNotSupend {reason} => reason) {
         let reason =
             reason_str.map(|s| errors::MustNotSuspendReason { span: data.source_span, reason: s });
-        tcx.emit_node_span_lint(
+        tcx.emit_diag_node_span_lint(
             rustc_session::lint::builtin::MUST_NOT_SUSPEND,
             hir_id,
             data.source_span,
diff --git a/compiler/rustc_mir_transform/src/errors.rs b/compiler/rustc_mir_transform/src/errors.rs
@@ -1,6 +1,8 @@
 use rustc_errors::codes::*;
-use rustc_errors::{Applicability, Diag, EmissionGuarantee, LintDiagnostic, Subdiagnostic, msg};
-use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
+use rustc_errors::{
+    Applicability, Diag, DiagCtxtHandle, Diagnostic, EmissionGuarantee, Level, Subdiagnostic, msg,
+};
+use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_middle::mir::AssertKind;
 use rustc_middle::query::Key;
 use rustc_middle::ty::TyCtxt;
@@ -48,7 +50,7 @@ pub(crate) fn emit_inline_always_target_feature_diagnostic<'a, 'tcx>(
     );
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("function cannot return without recursing")]
 #[help("a `loop` may express intention better if this is on purpose")]
 pub(crate) struct UnconditionalRecursion {
@@ -70,7 +72,7 @@ pub(crate) struct InvalidForceInline {
     pub reason: &'static str,
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 pub(crate) enum ConstMutate {
     #[diag("attempting to modify a `const` item")]
     #[note(
@@ -129,21 +131,26 @@ pub(crate) enum AssertLintKind {
     UnconditionalPanic,
 }
 
-impl<'a, P: std::fmt::Debug> LintDiagnostic<'a, ()> for AssertLint<P> {
-    fn decorate_lint<'b>(self, diag: &'b mut Diag<'a, ()>) {
-        diag.primary_message(match self.lint_kind {
-            AssertLintKind::ArithmeticOverflow => {
-                msg!("this arithmetic operation will overflow")
-            }
-            AssertLintKind::UnconditionalPanic => {
-                msg!("this operation will panic at runtime")
-            }
-        });
+impl<'a, P: std::fmt::Debug> Diagnostic<'a, ()> for AssertLint<P> {
+    fn into_diag(self, dcx: DiagCtxtHandle<'a>, level: Level) -> Diag<'a, ()> {
+        let mut diag = Diag::new(
+            dcx,
+            level,
+            match self.lint_kind {
+                AssertLintKind::ArithmeticOverflow => {
+                    msg!("this arithmetic operation will overflow")
+                }
+                AssertLintKind::UnconditionalPanic => {
+                    msg!("this operation will panic at runtime")
+                }
+            },
+        );
         let label = self.assert_kind.diagnostic_message();
         self.assert_kind.add_args(&mut |name, value| {
             diag.arg(name, value);
         });
         diag.span_label(self.span, label);
+        diag
     }
 }
 
@@ -156,14 +163,14 @@ impl AssertLintKind {
     }
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("call to inline assembly that may unwind")]
 pub(crate) struct AsmUnwindCall {
     #[label("call to inline assembly that may unwind")]
     pub span: Span,
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag(
     "call to {$foreign ->
         [true] foreign function
@@ -181,7 +188,7 @@ pub(crate) struct FfiUnwindCall {
     pub foreign: bool,
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("taking a reference to a function item does not give a function pointer")]
 pub(crate) struct FnItemRef {
     #[suggestion(
@@ -194,14 +201,14 @@ pub(crate) struct FnItemRef {
     pub ident: Ident,
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("value captured by `{$name}` is never read")]
 #[help("did you mean to capture by reference instead?")]
 pub(crate) struct UnusedCaptureMaybeCaptureRef {
     pub name: Symbol,
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("variable `{$name}` is assigned to, but never used")]
 #[note("consider using `_{$name}` instead")]
 pub(crate) struct UnusedVarAssignedOnly {
@@ -210,7 +217,7 @@ pub(crate) struct UnusedVarAssignedOnly {
     pub typo: Option<PatternTypo>,
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("value assigned to `{$name}` is never read")]
 pub(crate) struct UnusedAssign {
     pub name: Symbol,
@@ -237,14 +244,14 @@ pub(crate) struct UnusedAssignSuggestion {
     pub rhs_borrow_span: Span,
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("value passed to `{$name}` is never read")]
 #[help("maybe it is overwritten before being read?")]
 pub(crate) struct UnusedAssignPassed {
     pub name: Symbol,
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("unused variable: `{$name}`")]
 pub(crate) struct UnusedVariable {
     pub name: Symbol,
@@ -331,11 +338,13 @@ pub(crate) struct MustNotSupend<'a, 'tcx> {
 }
 
 // Needed for def_path_str
-impl<'a> LintDiagnostic<'a, ()> for MustNotSupend<'_, '_> {
-    fn decorate_lint<'b>(self, diag: &'b mut rustc_errors::Diag<'a, ()>) {
-        diag.primary_message(msg!(
-            "{$pre}`{$def_path}`{$post} held across a suspend point, but should not be"
-        ));
+impl<'a> Diagnostic<'a, ()> for MustNotSupend<'_, '_> {
+    fn into_diag(self, dcx: DiagCtxtHandle<'a>, level: Level) -> Diag<'a, ()> {
+        let mut diag = Diag::new(
+            dcx,
+            level,
+            msg!("{$pre}`{$def_path}`{$post} held across a suspend point, but should not be"),
+        );
         diag.span_label(self.yield_sp, msg!("the value is held across this suspend point"));
         if let Some(reason) = self.reason {
             diag.subdiagnostic(reason);
@@ -344,6 +353,7 @@ impl<'a> LintDiagnostic<'a, ()> for MustNotSupend<'_, '_> {
         diag.arg("pre", self.pre);
         diag.arg("def_path", self.tcx.def_path_str(self.def_id));
         diag.arg("post", self.post);
+        diag
     }
 }
 
diff --git a/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs b/compiler/rustc_mir_transform/src/ffi_unwind_calls.rs
@@ -63,7 +63,7 @@ fn has_ffi_unwind_calls(tcx: TyCtxt<'_>, local_def_id: LocalDefId) -> bool {
                     .lint_root;
                 let span = terminator.source_info.span;
 
-                tcx.emit_node_span_lint(
+                tcx.emit_diag_node_span_lint(
                     FFI_UNWIND_CALLS,
                     lint_root,
                     span,
@@ -115,7 +115,7 @@ fn has_ffi_unwind_calls(tcx: TyCtxt<'_>, local_def_id: LocalDefId) -> bool {
             let span = terminator.source_info.span;
 
             let foreign = fn_def_id.is_some();
-            tcx.emit_node_span_lint(
+            tcx.emit_diag_node_span_lint(
                 FFI_UNWIND_CALLS,
                 lint_root,
                 span,
diff --git a/compiler/rustc_mir_transform/src/function_item_references.rs b/compiler/rustc_mir_transform/src/function_item_references.rs
@@ -175,7 +175,7 @@ impl<'tcx> FunctionItemRefChecker<'_, 'tcx> {
             ret,
         );
 
-        self.tcx.emit_node_span_lint(
+        self.tcx.emit_diag_node_span_lint(
             FUNCTION_ITEM_REFERENCES,
             lint_root,
             span,
diff --git a/compiler/rustc_mir_transform/src/known_panics_lint.rs b/compiler/rustc_mir_transform/src/known_panics_lint.rs
@@ -297,7 +297,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
         let source_info = self.body.source_info(location);
         if let Some(lint_root) = self.lint_root(*source_info) {
             let span = source_info.span;
-            self.tcx.emit_node_span_lint(
+            self.tcx.emit_diag_node_span_lint(
                 lint_kind.lint(),
                 lint_root,
                 span,
diff --git a/compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs b/compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs
@@ -10,7 +10,7 @@ use rustc_hir::CRATE_HIR_ID;
 use rustc_hir::def_id::LocalDefId;
 use rustc_index::bit_set::MixedBitSet;
 use rustc_index::{IndexSlice, IndexVec};
-use rustc_macros::{LintDiagnostic, Subdiagnostic};
+use rustc_macros::{Diagnostic, Subdiagnostic};
 use rustc_middle::bug;
 use rustc_middle::mir::{
     self, BasicBlock, Body, ClearCrossCrate, Local, Location, MirDumper, Place, StatementKind,
@@ -451,7 +451,7 @@ pub(crate) fn run_lint<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId, body: &Body<
         }
 
         let span = local_labels[0].span;
-        tcx.emit_node_span_lint(
+        tcx.emit_diag_node_span_lint(
             lint::builtin::TAIL_EXPR_DROP_ORDER,
             lint_root.unwrap_or(CRATE_HIR_ID),
             span,
@@ -498,7 +498,7 @@ fn assign_observables_names(
     names
 }
 
-#[derive(LintDiagnostic)]
+#[derive(Diagnostic)]
 #[diag("relative drop order changing in Rust 2024")]
 struct TailExprDropOrderLint<'a> {
     #[subdiagnostic]
diff --git a/compiler/rustc_mir_transform/src/liveness.rs b/compiler/rustc_mir_transform/src/liveness.rs
@@ -968,7 +968,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
                     let typo = maybe_suggest_typo();
                     errors::UnusedVariableSugg::TryPrefix { spans: vec![def_span], name, typo }
                 };
-                tcx.emit_node_span_lint(
+                tcx.emit_diag_node_span_lint(
                     lint::builtin::UNUSED_VARIABLES,
                     hir_id,
                     def_span,
@@ -1018,7 +1018,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
                 }
 
                 let typo = maybe_suggest_typo();
-                tcx.emit_node_span_lint(
+                tcx.emit_diag_node_span_lint(
                     lint::builtin::UNUSED_VARIABLES,
                     hir_id,
                     def_span,
@@ -1060,7 +1060,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
                 errors::UnusedVariableSugg::TryPrefix { name, typo, spans: vec![def_span] }
             };
 
-            tcx.emit_node_span_lint(
+            tcx.emit_diag_node_span_lint(
                 lint::builtin::UNUSED_VARIABLES,
                 hir_id,
                 spans,
@@ -1126,20 +1126,20 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
                             source_info.span,
                             self.body,
                         );
-                        tcx.emit_node_span_lint(
+                        tcx.emit_diag_node_span_lint(
                             lint::builtin::UNUSED_ASSIGNMENTS,
                             hir_id,
                             source_info.span,
                             errors::UnusedAssign { name, help: suggestion.is_none(), suggestion },
                         )
                     }
-                    AccessKind::Param => tcx.emit_node_span_lint(
+                    AccessKind::Param => tcx.emit_diag_node_span_lint(
                         lint::builtin::UNUSED_ASSIGNMENTS,
                         hir_id,
                         source_info.span,
                         errors::UnusedAssignPassed { name },
                     ),
-                    AccessKind::Capture => tcx.emit_node_span_lint(
+                    AccessKind::Capture => tcx.emit_diag_node_span_lint(
                         lint::builtin::UNUSED_ASSIGNMENTS,
                         hir_id,
                         decl_span,
diff --git a/tests/ui/drop/drop-order-comparisons.e2021.stderr b/tests/ui/drop/drop-order-comparisons.e2021.stderr
diff --git a/tests/ui/drop/lint-tail-expr-drop-order.stderr b/tests/ui/drop/lint-tail-expr-drop-order.stderr
diff --git a/tests/ui/drop/tail_expr_drop_order-on-coroutine-unwind.stderr b/tests/ui/drop/tail_expr_drop_order-on-coroutine-unwind.stderr
