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

update: lints.rs for renamed traits

Browse Source 
update: `lints.rs` for renamed `SessionSubdiagnostic` and `AddSubdiagnostic`

fix: NonSnakeCaseDiagSub

fix: OverflowingBinHexSign
This commit is contained in:
Rejyr 2022-09-21 20:47:24 -04:00
parent e3bb2ebfbf
commit dc00aa3114
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
compiler/rustc_lint/src/lints.rs
View File

@ -1,6 +1,6 @@
use rustc_errors::{fluent, AddSubdiagnostic, Applicability, DecorateLint, EmissionGuarantee}; use rustc_errors::{fluent, AddToDiagnostic, Applicability, DecorateLint, EmissionGuarantee};
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_macros::{LintDiagnostic, SessionSubdiagnostic}; use rustc_macros::{LintDiagnostic, Subdiagnostic};
use rustc_middle::ty::{Predicate, Ty, TyCtxt}; use rustc_middle::ty::{Predicate, Ty, TyCtxt};
use rustc_span::{symbol::Ident, Span, Symbol}; use rustc_span::{symbol::Ident, Span, Symbol};
@ -16,7 +16,7 @@ pub struct ArrayIntoIterDiag<'a> {
pub sub: Option<ArrayIntoIterDiagSub>, pub sub: Option<ArrayIntoIterDiagSub>,
} }
#[derive(SessionSubdiagnostic)] #[derive(Subdiagnostic)]
pub enum ArrayIntoIterDiagSub { pub enum ArrayIntoIterDiagSub {
#[suggestion(remove_into_iter_suggestion, code = "", applicability = "maybe-incorrect")] #[suggestion(remove_into_iter_suggestion, code = "", applicability = "maybe-incorrect")]
RemoveIntoIter { RemoveIntoIter {
@ -129,7 +129,7 @@ pub struct NonCamelCaseType<'a> {
pub sub: NonCamelCaseTypeSub, pub sub: NonCamelCaseTypeSub,
} }
#[derive(SessionSubdiagnostic)] #[derive(Subdiagnostic)]
pub enum NonCamelCaseTypeSub { pub enum NonCamelCaseTypeSub {
#[label(label)] #[label(label)]
Label { Label {
@ -162,8 +162,14 @@ pub enum NonSnakeCaseDiagSub {
SuggestionAndNote { span: Span }, SuggestionAndNote { span: Span },
} }
impl AddSubdiagnostic for NonSnakeCaseDiagSub { impl AddToDiagnostic for NonSnakeCaseDiagSub {
fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) { fn add_to_diagnostic_with<F>(self, diag: &mut rustc_errors::Diagnostic, _: F)
where
F: Fn(
&mut rustc_errors::Diagnostic,
rustc_errors::SubdiagnosticMessage,
) -> rustc_errors::SubdiagnosticMessage,
{
match self { match self {
NonSnakeCaseDiagSub::Label { span } => { NonSnakeCaseDiagSub::Label { span } => {
diag.span_label(span, fluent::label); diag.span_label(span, fluent::label);
@ -209,7 +215,7 @@ pub struct NonUpperCaseGlobal<'a> {
pub sub: NonUpperCaseGlobalSub, pub sub: NonUpperCaseGlobalSub,
} }
#[derive(SessionSubdiagnostic)] #[derive(Subdiagnostic)]
pub enum NonUpperCaseGlobalSub { pub enum NonUpperCaseGlobalSub {
#[label(label)] #[label(label)]
Label { Label {
@ -307,8 +313,14 @@ pub enum OverflowingBinHexSign {
Negative, Negative,
} }
impl AddSubdiagnostic for OverflowingBinHexSign { impl AddToDiagnostic for OverflowingBinHexSign {
fn add_to_diagnostic(self, diag: &mut rustc_errors::Diagnostic) { fn add_to_diagnostic_with<F>(self, diag: &mut rustc_errors::Diagnostic, _: F)
where
F: Fn(
&mut rustc_errors::Diagnostic,
rustc_errors::SubdiagnosticMessage,
) -> rustc_errors::SubdiagnosticMessage,
{
match self { match self {
OverflowingBinHexSign::Positive => { OverflowingBinHexSign::Positive => {
diag.note(fluent::positive_note); diag.note(fluent::positive_note);
@ -321,7 +333,7 @@ impl AddSubdiagnostic for OverflowingBinHexSign {
} }
} }
#[derive(SessionSubdiagnostic)] #[derive(Subdiagnostic)]
pub enum OverflowingBinHexSub<'a> { pub enum OverflowingBinHexSub<'a> {
#[suggestion( #[suggestion(
suggestion, suggestion,
@ -493,7 +505,7 @@ pub struct PathStatementDrop {
pub sub: PathStatementDropSub, pub sub: PathStatementDropSub,
} }
#[derive(SessionSubdiagnostic)] #[derive(Subdiagnostic)]
pub enum PathStatementDropSub { pub enum PathStatementDropSub {
#[suggestion(suggestion, code = "drop({snippet});", applicability = "machine-applicable")] #[suggestion(suggestion, code = "drop({snippet});", applicability = "machine-applicable")]
Suggestion { Suggestion {