Skip to content

Commit ad29947

Browse files
committed
Also warn against #[diagnostic::do_not_recommend] on plain impls
1 parent dd31713 commit ad29947

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

Diff for: compiler/rustc_passes/src/check_attr.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
115115
for attr in attrs {
116116
match attr.path().as_slice() {
117117
[sym::diagnostic, sym::do_not_recommend, ..] => {
118-
self.check_do_not_recommend(attr.span, hir_id, target, attr)
118+
self.check_do_not_recommend(attr.span, hir_id, target, attr, item)
119119
}
120120
[sym::diagnostic, sym::on_unimplemented, ..] => {
121121
self.check_diagnostic_on_unimplemented(attr.span, hir_id, target)
@@ -354,8 +354,15 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
354354
hir_id: HirId,
355355
target: Target,
356356
attr: &Attribute,
357+
item: Option<ItemLike<'_>>,
357358
) {
358-
if !matches!(target, Target::Impl) {
359+
if !matches!(target, Target::Impl)
360+
|| matches!(
361+
item,
362+
Some(ItemLike::Item(hir::Item { kind: hir::ItemKind::Impl(_impl),.. }))
363+
if _impl.of_trait.is_none()
364+
)
365+
{
359366
self.tcx.emit_node_span_lint(
360367
UNKNOWN_OR_MALFORMED_DIAGNOSTIC_ATTRIBUTES,
361368
hir_id,

Diff for: tests/ui/diagnostic_namespace/do_not_recommend/incorrect-locations.current.stderr

+7-1
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,11 @@ warning: `#[diagnostic::do_not_recommend]` can only be placed on trait implement
4848
LL | #[diagnostic::do_not_recommend]
4949
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5050

51-
warning: 8 warnings emitted
51+
warning: `#[diagnostic::do_not_recommend]` can only be placed on trait implementations
52+
--> $DIR/incorrect-locations.rs:38:1
53+
|
54+
LL | #[diagnostic::do_not_recommend]
55+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
56+
57+
warning: 9 warnings emitted
5258

Diff for: tests/ui/diagnostic_namespace/do_not_recommend/incorrect-locations.next.stderr

+7-1
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,11 @@ warning: `#[diagnostic::do_not_recommend]` can only be placed on trait implement
4848
LL | #[diagnostic::do_not_recommend]
4949
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5050

51-
warning: 8 warnings emitted
51+
warning: `#[diagnostic::do_not_recommend]` can only be placed on trait implementations
52+
--> $DIR/incorrect-locations.rs:38:1
53+
|
54+
LL | #[diagnostic::do_not_recommend]
55+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
56+
57+
warning: 9 warnings emitted
5258

Diff for: tests/ui/diagnostic_namespace/do_not_recommend/incorrect-locations.rs

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ type Type = ();
1919
//~^WARN `#[diagnostic::do_not_recommend]` can only be placed
2020
enum Enum {}
2121

22+
#[diagnostic::do_not_recommend]
23+
//~^WARN `#[diagnostic::do_not_recommend]` can only be placed
24+
impl Enum {}
25+
2226
#[diagnostic::do_not_recommend]
2327
//~^WARN `#[diagnostic::do_not_recommend]` can only be placed
2428
extern "C" {}

0 commit comments

Comments
 (0)