bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Skip help messages if macro span is from macro

Browse source
This commit is contained in:
Tom Martin 2023-04-02 19:01:52 +01:00
parent 86230dcde6
commit 56207b8faf
No known key found for this signature in database
GPG key ID: 73A733F9629F5AC5
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_resolve/src/macros.rs
View file

@ -548,11 +548,13 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
err.span_label(path.span, format!("not {} {}", article, expected));
if kind == MacroKind::Derive && ext.macro_kind() != MacroKind::Derive {
if !path.span.from_expansion() {
// Suggest moving the macro out of the derive() as the macro isn't Derive
if kind == MacroKind::Derive && ext.macro_kind() != MacroKind::Derive {
err.span_help(path.span, "Remove from the surrounding `derive()`");
err.help(format!("Add as non-Derive macro\n`#[{}]`", path_str));
}
}
err.emit();
return Ok((self.dummy_ext(kind), Res::Err));