mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename LintContext::struct_span_lint as LintContext::span_lint.

Browse Source
This commit is contained in:
Nicholas Nethercote 2024-01-16 14:29:28 +11:00
parent 93955e094a
commit cf355c6e9d
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy.toml
View File

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

1
clippy_lints/src/utils/internal_lints/compiler_lint_functions.rs
View File

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

8
clippy_utils/src/diagnostics.rs
View File

@ -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) { pub fn span_lint<T: LintContext>(cx: &T, lint: &'static Lint, sp: impl Into<MultiSpan>, msg: &str) {
#[expect(clippy::disallowed_methods)] #[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); docs_link(diag, lint);
}); });
} }
@ -81,7 +81,7 @@ pub fn span_lint_and_help<T: LintContext>(
help: &str, help: &str,
) { ) {
#[expect(clippy::disallowed_methods)] #[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(); let help = help.to_string();
if let Some(help_span) = help_span { if let Some(help_span) = help_span {
diag.span_help(help_span, help.to_string()); diag.span_help(help_span, help.to_string());
@ -124,7 +124,7 @@ pub fn span_lint_and_note<T: LintContext>(
note: &str, note: &str,
) { ) {
#[expect(clippy::disallowed_methods)] #[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(); let note = note.to_string();
if let Some(note_span) = note_span { if let Some(note_span) = note_span {
diag.span_note(note_span, note); diag.span_note(note_span, note);
@ -146,7 +146,7 @@ pub fn span_lint_and_then<C, S, F>(cx: &C, lint: &'static Lint, sp: S, msg: &str
F: FnOnce(&mut Diagnostic), F: FnOnce(&mut Diagnostic),
{ {
#[expect(clippy::disallowed_methods)] #[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); f(diag);
docs_link(diag, lint); docs_link(diag, lint);
}); });

2
tests/ui-internal/disallow_struct_span_lint.rs → tests/ui-internal/disallow_span_lint.rs
View File

@ -11,7 +11,7 @@
use rustc_middle::ty::TyCtxt; use rustc_middle::ty::TyCtxt;
pub fn a(cx: impl LintContext, lint: &'static Lint, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) { 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( pub fn b(

6
tests/ui-internal/disallow_struct_span_lint.stderr → tests/ui-internal/disallow_span_lint.stderr
View File

@ -1,8 +1,8 @@
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 --> $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` = note: `-D clippy::disallowed-methods` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::disallowed_methods)]` = help: to override `-D warnings` add `#[allow(clippy::disallowed_methods)]`