Auto merge of #120017 - nnethercote:lint-api, r=oli-obk

Fix naming in the lint API

Methods for emit lints are named very inconsistently. This PR fixes that up.

r? `@compiler-errors`

Author: bors

clippy.toml

@@ -2,6 +2,6 @@ avoid-breaking-exported-api = false
 
 # use the various `span_lint_*` methods instead, which also add a link to the docs
 disallowed-methods = [
-    "rustc_lint::context::LintContext::struct_span_lint",
-    "rustc_middle::ty::context::TyCtxt::struct_span_lint_hir"
+    "rustc_lint::context::LintContext::span_lint",
+    "rustc_middle::ty::context::TyCtxt::node_span_lint"
 ]

clippy_lints/src/utils/internal_lints/compiler_lint_functions.rs

@@ -41,7 +41,6 @@ impl CompilerLintFunctions {
     pub fn new() -> Self {
         let mut map = FxHashMap::default();
         map.insert("span_lint", "utils::span_lint");
-        map.insert("struct_span_lint", "utils::span_lint");
         map.insert("lint", "utils::span_lint");
         map.insert("span_lint_note", "utils::span_lint_and_note");
         map.insert("span_lint_help", "utils::span_lint_and_help");

clippy_utils/src/diagnostics.rs

@@ -47,7 +47,7 @@ fn docs_link(diag: &mut Diagnostic, lint: &'static Lint) {
 /// ```
 pub fn span_lint<T: LintContext>(cx: &T, lint: &'static Lint, sp: impl Into<MultiSpan>, msg: &str) {
     #[expect(clippy::disallowed_methods)]
-    cx.struct_span_lint(lint, sp, msg.to_string(), |diag| {
+    cx.span_lint(lint, sp, msg.to_string(), |diag| {
         docs_link(diag, lint);
     });
 }
@@ -81,7 +81,7 @@ pub fn span_lint_and_help<T: LintContext>(
     help: &str,
 ) {
     #[expect(clippy::disallowed_methods)]
-    cx.struct_span_lint(lint, span, msg.to_string(), |diag| {
+    cx.span_lint(lint, span, msg.to_string(), |diag| {
         let help = help.to_string();
         if let Some(help_span) = help_span {
             diag.span_help(help_span, help.to_string());
@@ -124,7 +124,7 @@ pub fn span_lint_and_note<T: LintContext>(
     note: &str,
 ) {
     #[expect(clippy::disallowed_methods)]
-    cx.struct_span_lint(lint, span, msg.to_string(), |diag| {
+    cx.span_lint(lint, span, msg.to_string(), |diag| {
         let note = note.to_string();
         if let Some(note_span) = note_span {
             diag.span_note(note_span, note);
@@ -146,15 +146,15 @@ where
     F: FnOnce(&mut Diagnostic),
 {
     #[expect(clippy::disallowed_methods)]
-    cx.struct_span_lint(lint, sp, msg.to_string(), |diag| {
+    cx.span_lint(lint, sp, msg.to_string(), |diag| {
         f(diag);
         docs_link(diag, lint);
     });
 }
 
 pub fn span_lint_hir(cx: &LateContext<'_>, lint: &'static Lint, hir_id: HirId, sp: Span, msg: &str) {
     #[expect(clippy::disallowed_methods)]
-    cx.tcx.struct_span_lint_hir(lint, hir_id, sp, msg.to_string(), |diag| {
+    cx.tcx.node_span_lint(lint, hir_id, sp, msg.to_string(), |diag| {
         docs_link(diag, lint);
     });
 }
@@ -168,7 +168,7 @@ pub fn span_lint_hir_and_then(
     f: impl FnOnce(&mut Diagnostic),
 ) {
     #[expect(clippy::disallowed_methods)]
-    cx.tcx.struct_span_lint_hir(lint, hir_id, sp, msg.to_string(), |diag| {
+    cx.tcx.node_span_lint(lint, hir_id, sp, msg.to_string(), |diag| {
         f(diag);
         docs_link(diag, lint);
     });

tests/ui-internal/disallow_struct_span_lint.rs renamed to tests/ui-internal/disallow_span_lint.rs

@@ -11,7 +11,7 @@ use rustc_lint::{Lint, LintContext};
 use rustc_middle::ty::TyCtxt;
 
 pub fn a(cx: impl LintContext, lint: &'static Lint, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) {
-    cx.struct_span_lint(lint, span, msg, |_| {});
+    cx.span_lint(lint, span, msg, |_| {});
 }
 
 pub fn b(
@@ -21,7 +21,7 @@ pub fn b(
     span: impl Into<MultiSpan>,
     msg: impl Into<DiagnosticMessage>,
 ) {
-    tcx.struct_span_lint_hir(lint, hir_id, span, msg, |_| {});
+    tcx.node_span_lint(lint, hir_id, span, msg, |_| {});
 }
 
 fn main() {}

tests/ui-internal/disallow_struct_span_lint.stderr renamed to tests/ui-internal/disallow_span_lint.stderr

@@ -1,16 +1,16 @@
-error: use of a disallowed method `rustc_lint::context::LintContext::struct_span_lint`
+error: use of a disallowed method `rustc_lint::context::LintContext::span_lint`
   --> $DIR/disallow_struct_span_lint.rs:14:5
    |
-LL |     cx.struct_span_lint(lint, span, msg, |_| {});
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |     cx.span_lint(lint, span, msg, |_| {});
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D clippy::disallowed-methods` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::disallowed_methods)]`
 
-error: use of a disallowed method `rustc_middle::ty::context::TyCtxt::struct_span_lint_hir`
+error: use of a disallowed method `rustc_middle::ty::context::TyCtxt::node_span_lint`
   --> $DIR/disallow_struct_span_lint.rs:24:5
    |
-LL |     tcx.struct_span_lint_hir(lint, hir_id, span, msg, |_| {});
+LL |     tcx.node_span_lint(lint, hir_id, span, msg, |_| {});
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors