Unrolled build for #153051

Rollup merge of #153051 - GuillaumeGomez:migrate-diag, r=JonathanBrouwer

Migration of `LintDiagnostic` - part 3

Follow-up of #152933 and of #153016.

More `LintDiagnostic` items being migrated to `Diagnostic`. Since there is no remaining `emit_node_span_lint` calls, I replaced the method with the code of `emit_diag_node_span_lint`.

r? @JonathanBrouwer

Author: rust-timer

compiler/rustc_borrowck/src/lib.rs

@@ -2698,12 +2698,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, '_, 'tcx> {
 
             let mut_span = tcx.sess.source_map().span_until_non_whitespace(span);
 
-            tcx.emit_diag_node_span_lint(
-                UNUSED_MUT,
-                lint_root,
-                span,
-                VarNeedNotMut { span: mut_span },
-            )
+            tcx.emit_node_span_lint(UNUSED_MUT, lint_root, span, VarNeedNotMut { span: mut_span })
         }
     }
 }

compiler/rustc_codegen_ssa/src/target_features.rs

@@ -75,7 +75,7 @@ pub(crate) fn from_target_feature_attr(
                         // For "neon" specifically, we emit an FCW instead of a hard error.
                         // See <https://github.com/rust-lang/rust/issues/134375>.
                         if tcx.sess.target.arch == Arch::AArch64 && name.as_str() == "neon" {
-                            tcx.emit_diag_node_span_lint(
+                            tcx.emit_node_span_lint(
                                 AARCH64_SOFTFLOAT_NEON,
                                 tcx.local_def_id_to_hir_id(did),
                                 feature_span,

compiler/rustc_const_eval/src/const_eval/error.rs

@@ -256,5 +256,5 @@ pub(super) fn lint<'tcx, L>(
 {
     let (span, frames) = get_span_and_frames(tcx, &machine.stack);
 
-    tcx.emit_diag_node_span_lint(lint, machine.best_lint_scope(*tcx), span, decorator(frames));
+    tcx.emit_node_span_lint(lint, machine.best_lint_scope(*tcx), span, decorator(frames));
 }

compiler/rustc_const_eval/src/const_eval/machine.rs

@@ -718,7 +718,7 @@ impl<'tcx> interpret::Machine<'tcx> for CompileTimeMachine<'tcx> {
                     .level
                     .is_error();
                 let span = ecx.cur_span();
-                ecx.tcx.emit_diag_node_span_lint(
+                ecx.tcx.emit_node_span_lint(
                     rustc_session::lint::builtin::LONG_RUNNING_CONST_EVAL,
                     hir_id,
                     span,

compiler/rustc_hir_analysis/src/check/check.rs

@@ -1256,7 +1256,7 @@ fn check_impl_items_against_trait<'tcx>(
         }
 
         if self_is_guaranteed_unsize_self && tcx.generics_require_sized_self(ty_trait_item.def_id) {
-            tcx.emit_diag_node_span_lint(
+            tcx.emit_node_span_lint(
                 rustc_lint_defs::builtin::DEAD_CODE,
                 tcx.local_def_id_to_hir_id(ty_impl_item.def_id.expect_local()),
                 tcx.def_span(ty_impl_item.def_id),

compiler/rustc_hir_analysis/src/check/compare_impl_item/refine.rs

@@ -345,7 +345,7 @@ fn report_mismatched_rpitit_signature<'tcx>(
         with_no_trimmed_paths!(with_types_for_signature!(format!("{return_ty}")));
 
     let span = unmatched_bound.unwrap_or(span);
-    tcx.emit_diag_node_span_lint(
+    tcx.emit_node_span_lint(
         if is_internal { REFINING_IMPL_TRAIT_INTERNAL } else { REFINING_IMPL_TRAIT_REACHABLE },
         tcx.local_def_id_to_hir_id(impl_m_def_id.expect_local()),
         span,
@@ -442,7 +442,7 @@ fn report_mismatched_rpitit_captures<'tcx>(
         .sort_by_cached_key(|arg| !matches!(arg.kind(), ty::GenericArgKind::Lifetime(_)));
     let suggestion = format!("use<{}>", trait_captured_args.iter().join(", "));
 
-    tcx.emit_diag_node_span_lint(
+    tcx.emit_node_span_lint(
         if is_internal { REFINING_IMPL_TRAIT_INTERNAL } else { REFINING_IMPL_TRAIT_REACHABLE },
         tcx.local_def_id_to_hir_id(impl_opaque_def_id),
         use_bound_span,

compiler/rustc_hir_analysis/src/check/wfcheck.rs

@@ -797,7 +797,7 @@ fn lint_item_shadowing_supertrait_item<'tcx>(tcx: TyCtxt<'tcx>, trait_item_def_i
             errors::SupertraitItemShadowee::Several { traits: traits.into(), spans: spans.into() }
         };
 
-        tcx.emit_diag_node_span_lint(
+        tcx.emit_node_span_lint(
             SHADOWING_SUPERTRAIT_ITEMS,
             tcx.local_def_id_to_hir_id(trait_item_def_id),
             tcx.def_span(trait_item_def_id),
@@ -2458,7 +2458,7 @@ fn lint_redundant_lifetimes<'tcx>(
                 && outlives_env.free_region_map().sub_free_regions(tcx, victim, candidate)
             {
                 shadowed.insert(victim);
-                tcx.emit_diag_node_span_lint(
+                tcx.emit_node_span_lint(
                     rustc_lint_defs::builtin::REDUNDANT_LIFETIMES,
                     tcx.local_def_id_to_hir_id(def_id.expect_local()),
                     tcx.def_span(def_id),

compiler/rustc_hir_analysis/src/coherence/orphan.rs

@@ -497,13 +497,13 @@ fn lint_uncovered_ty_params<'tcx>(
         let name = tcx.item_ident(param_def_id);
 
         match local_ty {
-            Some(local_type) => tcx.emit_diag_node_span_lint(
+            Some(local_type) => tcx.emit_node_span_lint(
                 UNCOVERED_PARAM_IN_PROJECTION,
                 hir_id,
                 span,
                 errors::TyParamFirstLocalLint { span, note: (), param: name, local_type },
             ),
-            None => tcx.emit_diag_node_span_lint(
+            None => tcx.emit_node_span_lint(
                 UNCOVERED_PARAM_IN_PROJECTION,
                 hir_id,
                 span,

compiler/rustc_hir_analysis/src/hir_ty_lowering/dyn_trait.rs

@@ -291,7 +291,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
                 // FIXME(mgca): Ideally we would generalize the name of this lint to sth. like
                 // `unused_associated_item_bindings` since this can now also trigger on *const*
                 // projections / assoc *const* bindings.
-                tcx.emit_diag_node_span_lint(
+                tcx.emit_node_span_lint(
                     UNUSED_ASSOCIATED_TYPE_BOUNDS,
                     hir_id,
                     span,

compiler/rustc_hir_typeck/src/cast.rs

@@ -687,7 +687,7 @@ impl<'a, 'tcx> CastCheck<'tcx> {
         };
         let expr_ty = fcx.resolve_vars_if_possible(self.expr_ty);
         let cast_ty = fcx.resolve_vars_if_possible(self.cast_ty);
-        fcx.tcx.emit_diag_node_span_lint(
+        fcx.tcx.emit_node_span_lint(
             lint,
             self.expr.hir_id,
             self.span,
@@ -1125,7 +1125,7 @@ impl<'a, 'tcx> CastCheck<'tcx> {
         };
 
         let lint = errors::LossyProvenancePtr2Int { expr_ty, cast_ty, sugg };
-        fcx.tcx.emit_diag_node_span_lint(
+        fcx.tcx.emit_node_span_lint(
             lint::builtin::LOSSY_PROVENANCE_CASTS,
             self.expr.hir_id,
             self.span,
@@ -1141,7 +1141,7 @@ impl<'a, 'tcx> CastCheck<'tcx> {
         let expr_ty = fcx.resolve_vars_if_possible(self.expr_ty);
         let cast_ty = fcx.resolve_vars_if_possible(self.cast_ty);
         let lint = errors::LossyProvenanceInt2Ptr { expr_ty, cast_ty, sugg };
-        fcx.tcx.emit_diag_node_span_lint(
+        fcx.tcx.emit_node_span_lint(
             lint::builtin::FUZZY_PROVENANCE_CASTS,
             self.expr.hir_id,
             self.span,