resolve merge conflict from cherry-picking 6a47326a04
This commit is contained in:
parent
b8e03cfa55
commit
1222541cfd
2 changed files with 10 additions and 0 deletions
|
@ -384,3 +384,6 @@ passes_local_duplicate_lang_item =
|
||||||
passes_invalid_attr_at_crate_level =
|
passes_invalid_attr_at_crate_level =
|
||||||
`{$name}` attribute cannot be used at crate level
|
`{$name}` attribute cannot be used at crate level
|
||||||
.suggestion = perhaps you meant to use an outer attribute
|
.suggestion = perhaps you meant to use an outer attribute
|
||||||
|
|
||||||
|
passes_deprecated_annotation_has_no_effect = this `#[deprecated]` annotation has no effect
|
||||||
|
.suggestion = remove the unnecessary deprecation attribute
|
||||||
|
|
|
@ -744,3 +744,10 @@ impl IntoDiagnostic<'_> for InvalidAttrAtCrateLevel {
|
||||||
diag
|
diag
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(LintDiagnostic)]
|
||||||
|
#[diag(passes::deprecated_annotation_has_no_effect)]
|
||||||
|
pub struct DeprecatedAnnotationHasNoEffect {
|
||||||
|
#[suggestion(applicability = "machine-applicable", code = "")]
|
||||||
|
pub span: Span,
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue