bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Hack around a conflict with clippy::needless_lifetimes

Browse source
This commit is contained in:
Pavel Grigorenko 2024-09-01 16:49:55 +03:00
parent 547db4a4b7
commit 9e2d264fa2
18 changed files with 7 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_lint/src/lints.rs
View file

@ -2639,6 +2639,13 @@ impl<G: EmissionGuarantee> LintDiagnostic<'_, G> for ElidedNamedLifetime {
if let Some(declaration) = declaration {
diag.span_label(declaration, fluent::lint_label_named);
}
// FIXME(GrigorenkoPV): this `if` and `return` should be removed,
// but currently this lint's suggestions can conflict with those of `clippy::needless_lifetimes`:
// https://github.com/rust-lang/rust/pull/129840#issuecomment-2323349119
// HACK: `'static` suggestions will never sonflict, emit only those for now.
if name != rustc_span::symbol::kw::StaticLifetime {
return;
}
match kind {
MissingLifetimeKind::Underscore => diag.span_suggestion_verbose(
span,