Skip to content

Commit 4627db2

Browse files
clubby789clubby789
committed
Diagnostic for using macro_rules macro as attr/derive
1 parent 8522140 commit 4627db2

6 files changed

+56
-32
lines changed

‎compiler/rustc_resolve/messages.ftl

+7-1
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,14 @@ resolve_lowercase_self =
257257
attempt to use a non-constant value in a constant
258258
.suggestion = try using `Self`
259259
260+
resolve_macro_cannot_use_as_attr =
261+
`{$ident}` exists, but a declarative macro cannot be used as an attribute macro
262+
263+
resolve_macro_cannot_use_as_derive =
264+
`{$ident}` exists, but a declarative macro cannot be used as a derive macro
265+
260266
resolve_macro_defined_later =
261-
a macro with the same name exists, but it appears later at here
267+
a macro with the same name exists, but it appears later
262268
263269
resolve_macro_expanded_extern_crate_cannot_shadow_extern_arguments =
264270
macro-expanded `extern crate` items cannot shadow names passed with `--extern`

‎compiler/rustc_resolve/src/diagnostics.rs

+15-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ use tracing::debug;
3535

3636
use crate::errors::{
3737
self, AddedMacroUse, ChangeImportBinding, ChangeImportBindingSuggestion, ConsiderAddingADerive,
38-
ExplicitUnsafeTraits, MacroDefinedLater, MacroSuggMovePosition, MaybeMissingMacroRulesName,
38+
ExplicitUnsafeTraits, MacroDefinedLater, MacroRulesNot, MacroSuggMovePosition,
39+
MaybeMissingMacroRulesName,
3940
};
4041
use crate::imports::{Import, ImportKind};
4142
use crate::late::{PatternSource, Rib};
@@ -1475,8 +1476,19 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
14751476
let scope = self.local_macro_def_scopes[&def_id];
14761477
let parent_nearest = parent_scope.module.nearest_parent_mod();
14771478
if Some(parent_nearest) == scope.opt_def_id() {
1478-
err.subdiagnostic(MacroDefinedLater { span: unused_ident.span });
1479-
err.subdiagnostic(MacroSuggMovePosition { span: ident.span, ident });
1479+
match macro_kind {
1480+
MacroKind::Bang => {
1481+
err.subdiagnostic(MacroDefinedLater { span: unused_ident.span });
1482+
err.subdiagnostic(MacroSuggMovePosition { span: ident.span, ident });
1483+
}
1484+
MacroKind::Attr => {
1485+
err.subdiagnostic(MacroRulesNot::Attr { span: unused_ident.span, ident });
1486+
}
1487+
MacroKind::Derive => {
1488+
err.subdiagnostic(MacroRulesNot::Derive { span: unused_ident.span, ident });
1489+
}
1490+
}
1491+
14801492
return;
14811493
}
14821494
}

‎compiler/rustc_resolve/src/errors.rs

+16
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,22 @@ pub(crate) struct MacroSuggMovePosition {
665665
pub(crate) ident: Ident,
666666
}
667667

668+
#[derive(Subdiagnostic)]
669+
pub(crate) enum MacroRulesNot {
670+
#[label(resolve_macro_cannot_use_as_attr)]
671+
Attr {
672+
#[primary_span]
673+
span: Span,
674+
ident: Ident,
675+
},
676+
#[label(resolve_macro_cannot_use_as_derive)]
677+
Derive {
678+
#[primary_span]
679+
span: Span,
680+
ident: Ident,
681+
},
682+
}
683+
668684
#[derive(Subdiagnostic)]
669685
#[note(resolve_missing_macro_rules_name)]
670686
pub(crate) struct MaybeMissingMacroRulesName {

‎tests/ui/macros/defined-later-issue-121061-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: cannot find macro `something_later` in this scope
44
LL | something_later!();
55
| ^^^^^^^^^^^^^^^ consider moving the definition of `something_later` before this call
66
|
7-
note: a macro with the same name exists, but it appears later at here
7+
note: a macro with the same name exists, but it appears later
88
--> $DIR/defined-later-issue-121061-2.rs:6:18
99
|
1010
LL | macro_rules! something_later {

‎tests/ui/macros/defined-later-issue-121061.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: cannot find macro `something_later` in this scope
44
LL | something_later!();
55
| ^^^^^^^^^^^^^^^ consider moving the definition of `something_later` before this call
66
|
7-
note: a macro with the same name exists, but it appears later at here
7+
note: a macro with the same name exists, but it appears later
88
--> $DIR/defined-later-issue-121061.rs:5:14
99
|
1010
LL | macro_rules! something_later {

‎tests/ui/macros/macro-rules-as-derive-or-attr-issue-132928.stderr

+16-26
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,41 @@
11
error: cannot find derive macro `sample` in this scope
22
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:6:10
33
|
4-
LL | #[derive(sample)]
5-
| ^^^^^^ consider moving the definition of `sample` before this call
6-
|
7-
note: a macro with the same name exists, but it appears later at here
8-
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:3:14
9-
|
104
LL | macro_rules! sample { () => {} }
11-
| ^^^^^^
5+
| ------ `sample` exists, but a declarative macro cannot be used as a derive macro
6+
...
7+
LL | #[derive(sample)]
8+
| ^^^^^^
129

1310
error: cannot find attribute `sample` in this scope
1411
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:5:3
1512
|
16-
LL | #[sample]
17-
| ^^^^^^ consider moving the definition of `sample` before this call
18-
|
19-
note: a macro with the same name exists, but it appears later at here
20-
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:3:14
21-
|
2213
LL | macro_rules! sample { () => {} }
23-
| ^^^^^^
14+
| ------ `sample` exists, but a declarative macro cannot be used as an attribute macro
15+
LL |
16+
LL | #[sample]
17+
| ^^^^^^
2418

2519
error: cannot find derive macro `sample` in this scope
2620
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:6:10
2721
|
22+
LL | macro_rules! sample { () => {} }
23+
| ------ `sample` exists, but a declarative macro cannot be used as a derive macro
24+
...
2825
LL | #[derive(sample)]
29-
| ^^^^^^ consider moving the definition of `sample` before this call
26+
| ^^^^^^
3027
|
31-
note: a macro with the same name exists, but it appears later at here
32-
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:3:14
33-
|
34-
LL | macro_rules! sample { () => {} }
35-
| ^^^^^^
3628
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
3729

3830
error: cannot find derive macro `sample` in this scope
3931
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:6:10
4032
|
33+
LL | macro_rules! sample { () => {} }
34+
| ------ `sample` exists, but a declarative macro cannot be used as a derive macro
35+
...
4136
LL | #[derive(sample)]
42-
| ^^^^^^ consider moving the definition of `sample` before this call
43-
|
44-
note: a macro with the same name exists, but it appears later at here
45-
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:3:14
37+
| ^^^^^^
4638
|
47-
LL | macro_rules! sample { () => {} }
48-
| ^^^^^^
4939
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
5040

5141
error: aborting due to 4 previous errors

0 commit comments

Comments
 (0)