bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Update non-derive macro error message to match suggestion

Browse source 
It's now split between two errors, one to remove the invalid derive macro
and one suggesting adding a new non-derive macro
This commit is contained in:
Tom Martin 2023-03-30 21:43:32 +01:00
parent 42f2be8a8c
commit 10c36445ff
No known key found for this signature in database
GPG key ID: 73A733F9629F5AC5
4 changed files with 27 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -549,15 +549,9 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
err.span_label(path.span, format!("not {} {}", article, expected));
if kind == MacroKind::Derive && ext.macro_kind() != MacroKind::Derive {
// Suggest removing the derive() as the macro isn't Derive
let opening_span =
path.span.shrink_to_lo().with_lo(path.span.lo() - rustc_span::BytePos(7));
let closing_span =
path.span.shrink_to_hi().with_hi(path.span.hi() + rustc_span::BytePos(1));
err.span_help(
vec![opening_span, closing_span],
"remove the surrounding \"derive()\":",
);
// Suggest moving the macro our of the derive() as the macro isn't Derive
err.span_help(path.span, "Remove from the surrounding `derive()`");
err.help(format!("Add as non-Derive macro\n`#[{}]`", path_str));
}
err.emit();