Add a suggestion if macro_rules is misspelled

This commit is contained in:
Fabian Wolff 2021-11-28 23:10:37 +01:00
parent 5fd3a5c7c1
commit b9b4f549a4
4 changed files with 61 additions and 4 deletions

View File

@ -15,6 +15,7 @@ use rustc_ast::{MacArgs, MacCall, MacDelimiter};
use rustc_ast_pretty::pprust; use rustc_ast_pretty::pprust;
use rustc_errors::{struct_span_err, Applicability, PResult, StashKey}; use rustc_errors::{struct_span_err, Applicability, PResult, StashKey};
use rustc_span::edition::{Edition, LATEST_STABLE_EDITION}; use rustc_span::edition::{Edition, LATEST_STABLE_EDITION};
use rustc_span::lev_distance::lev_distance;
use rustc_span::source_map::{self, Span}; use rustc_span::source_map::{self, Span};
use rustc_span::symbol::{kw, sym, Ident, Symbol}; use rustc_span::symbol::{kw, sym, Ident, Symbol};
@ -407,10 +408,30 @@ impl<'a> Parser<'a> {
fn parse_item_macro(&mut self, vis: &Visibility) -> PResult<'a, MacCall> { fn parse_item_macro(&mut self, vis: &Visibility) -> PResult<'a, MacCall> {
let path = self.parse_path(PathStyle::Mod)?; // `foo::bar` let path = self.parse_path(PathStyle::Mod)?; // `foo::bar`
self.expect(&token::Not)?; // `!` self.expect(&token::Not)?; // `!`
let args = self.parse_mac_args()?; // `( .. )` or `[ .. ]` (followed by `;`), or `{ .. }`. match self.parse_mac_args() {
self.eat_semi_for_macro_if_needed(&args); // `( .. )` or `[ .. ]` (followed by `;`), or `{ .. }`.
self.complain_if_pub_macro(vis, false); Ok(args) => {
Ok(MacCall { path, args, prior_type_ascription: self.last_type_ascription }) self.eat_semi_for_macro_if_needed(&args);
self.complain_if_pub_macro(vis, false);
Ok(MacCall { path, args, prior_type_ascription: self.last_type_ascription })
}
Err(mut err) => {
// Maybe the user misspelled `macro_rules` (issue #91227)
if self.token.is_ident()
&& path.segments.len() == 1
&& lev_distance("macro_rules", &path.segments[0].ident.to_string()) <= 3
{
err.span_suggestion(
path.span,
"perhaps you meant to define a macro",
"macro_rules".to_string(),
Applicability::MachineApplicable,
);
}
Err(err)
}
}
} }
/// Recover if we parsed attributes and expected an item but there was none. /// Recover if we parsed attributes and expected an item but there was none.

View File

@ -0,0 +1,13 @@
// Regression test for issue #91227.
// run-rustfix
#![allow(unused_macros)]
macro_rules! thing {
//~^ ERROR: expected one of
//~| HELP: perhaps you meant to define a macro
() => {}
}
fn main() {}

View File

@ -0,0 +1,13 @@
// Regression test for issue #91227.
// run-rustfix
#![allow(unused_macros)]
marco_rules! thing {
//~^ ERROR: expected one of
//~| HELP: perhaps you meant to define a macro
() => {}
}
fn main() {}

View File

@ -0,0 +1,10 @@
error: expected one of `(`, `[`, or `{`, found `thing`
--> $DIR/misspelled-macro-rules.rs:7:14
|
LL | marco_rules! thing {
| ----------- ^^^^^ expected one of `(`, `[`, or `{`
| |
| help: perhaps you meant to define a macro: `macro_rules`
error: aborting due to previous error