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

Add suggestion to remove derive() if invoked macro is non-derive

Browse source
This commit is contained in:
Tom Martin 2023-03-26 15:59:45 +01:00
parent 89c2e3d3d7
commit 42f2be8a8c
No known key found for this signature in database
GPG key ID: 73A733F9629F5AC5
4 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -544,11 +544,23 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
if let Some((article, expected)) = unexpected_res {
let path_str = pprust::path_to_string(path);
let msg = format!("expected {}, found {} `{}`", expected, res.descr(), path_str);
self.tcx
.sess
.struct_span_err(path.span, &msg)
.span_label(path.span, format!("not {} {}", article, expected))
.emit();
let mut err = self.tcx.sess.struct_span_err(path.span, &msg);
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()\":",
);
}
err.emit();
return Ok((self.dummy_ext(kind), Res::Err));
}