bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

elided_named_lifetimes: manually implement LintDiagnostic

Browse source
This commit is contained in:
Pavel Grigorenko 2024-09-01 04:08:55 +03:00
parent dcfc71310d
commit 547db4a4b7
20 changed files with 75 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/rustc_lint/src/context/diagnostics.rs
View file

@ -7,7 +7,6 @@ use rustc_ast::util::unicode::TEXT_FLOW_CONTROL_CHARS;
use rustc_errors::{
elided_lifetime_in_path_suggestion, Applicability, Diag, DiagArgValue, LintDiagnostic,
};
use rustc_hir::MissingLifetimeKind;
use rustc_middle::middle::stability;
use rustc_session::lint::{BuiltinLintDiag, ElidedLifetimeResolution};
use rustc_session::Session;
@ -15,7 +14,6 @@ use rustc_span::symbol::kw;
use rustc_span::BytePos;
use tracing::debug;
use crate::fluent_generated;
use crate::lints::{self, ElidedNamedLifetime};
mod check_cfg;
@ -445,31 +443,15 @@ pub(super) fn decorate_lint(sess: &Session, diagnostic: BuiltinLintDiag, diag: &
lints::UnexpectedBuiltinCfg { cfg, cfg_name, controlled_by }.decorate_lint(diag)
}
BuiltinLintDiag::ElidedNamedLifetimes { elided: (span, kind), resolution } => {
let (name, named_declaration) = match resolution {
ElidedLifetimeResolution::Static => (kw::StaticLifetime, None),
ElidedLifetimeResolution::Param(name, declaration) => (name, Some(declaration)),
};
ElidedNamedLifetime { span, name, named_declaration }.decorate_lint(diag);
let (applicability, suggestion) = match kind {
MissingLifetimeKind::Underscore => {
(Applicability::MachineApplicable, format!("{name}"))
match resolution {
ElidedLifetimeResolution::Static => {
ElidedNamedLifetime { span, kind, name: kw::StaticLifetime, declaration: None }
}
MissingLifetimeKind::Ampersand => {
(Applicability::MachineApplicable, format!("&{name} "))
ElidedLifetimeResolution::Param(name, declaration) => {
ElidedNamedLifetime { span, kind, name, declaration: Some(declaration) }
}
MissingLifetimeKind::Comma => (Applicability::Unspecified, format!("<{name}, ")),
MissingLifetimeKind::Brackets => (
Applicability::Unspecified,
format!("{}<{name}>", sess.source_map().span_to_snippet(span).unwrap()),
),
};
diag.span_suggestion_verbose(
span,
fluent_generated::lint_elided_named_lifetime_suggestion,
suggestion,
applicability,
);
}
.decorate_lint(diag)
}
}
}

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

@ -9,7 +9,7 @@ use rustc_errors::{
};
use rustc_hir::def::Namespace;
use rustc_hir::def_id::DefId;
use rustc_hir::{self as hir};
use rustc_hir::{self as hir, MissingLifetimeKind};
use rustc_macros::{LintDiagnostic, Subdiagnostic};
use rustc_middle::ty::inhabitedness::InhabitedPredicate;
use rustc_middle::ty::{Clause, PolyExistentialTraitRef, Ty, TyCtxt};
@ -2623,14 +2623,49 @@ pub(crate) struct ElidedLifetimesInPaths {
pub subdiag: ElidedLifetimeInPathSubdiag,
}
#[derive(LintDiagnostic)]
#[diag(lint_elided_named_lifetime)]
pub(crate) struct ElidedNamedLifetime {
#[label(lint_label_elided)]
pub span: Span,
pub kind: MissingLifetimeKind,
pub name: Symbol,
#[label(lint_label_named)]
pub named_declaration: Option<Span>,
pub declaration: Option<Span>,
}
impl<G: EmissionGuarantee> LintDiagnostic<'_, G> for ElidedNamedLifetime {
fn decorate_lint(self, diag: &mut rustc_errors::Diag<'_, G>) {
let Self { span, kind, name, declaration } = self;
diag.primary_message(fluent::lint_elided_named_lifetime);
diag.arg("name", name);
diag.span_label(span, fluent::lint_label_elided);
if let Some(declaration) = declaration {
diag.span_label(declaration, fluent::lint_label_named);
}
match kind {
MissingLifetimeKind::Underscore => diag.span_suggestion_verbose(
span,
fluent::lint_suggestion,
format!("{name}"),
Applicability::MachineApplicable,
),
MissingLifetimeKind::Ampersand => diag.span_suggestion_verbose(
span.shrink_to_hi(),
fluent::lint_suggestion,
format!("{name} "),
Applicability::MachineApplicable,
),
MissingLifetimeKind::Comma => diag.span_suggestion_verbose(
span.shrink_to_hi(),
fluent::lint_suggestion,
format!("{name}, "),
Applicability::MachineApplicable,
),
MissingLifetimeKind::Brackets => diag.span_suggestion_verbose(
span.shrink_to_hi(),
fluent::lint_suggestion,
format!("<{name}>"),
Applicability::MachineApplicable,
),
};
}
}
#[derive(LintDiagnostic)]