user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup code after review fixes

Browse source
This commit is contained in:
Janusz Marcinkiewicz 2019-11-23 04:01:14 +01:00
parent 0e660d8a79
commit bbd0d9bea0
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/librustc_parse/parser/item.rs
View file

@ -1752,25 +1752,22 @@ impl<'a> Parser<'a> {
fn recover_nested_adt_item(&mut self, keyword: Symbol) -> PResult<'a, bool> {
if self.token.is_keyword(kw::Enum) ||
self.token.is_keyword(kw::Struct) ||
self.token.is_keyword(kw::Union) {
let prev_token = self.token.clone();
self.token.is_keyword(kw::Union)
{
let kw_token = self.token.clone();
let kw_str = pprust::token_to_string(&kw_token);
let item = self.parse_item()?;
if self.token == token::Comma {
self.bump();
}
self.eat(&token::Comma);
let mut err = self.struct_span_err(
prev_token.span,
&format!("`{}` definition cannot be nested inside `{}`", pprust::token_to_string(&prev_token), keyword),
);
err.span_suggestion(
self.struct_span_err(
kw_token.span,
&format!("`{}` definition cannot be nested inside `{}`", kw_str, keyword),
).span_suggestion(
item.unwrap().span,
&format!("consider creating a new `{}` definition instead of nesting", pprust::token_to_string(&prev_token)),
&format!("consider creating a new `{}` definition instead of nesting", kw_str),
String::new(),
Applicability::MaybeIncorrect,
);
err.emit();
).emit();
// We successfully parsed the item but we must inform the caller about nested problem.
return Ok(false)
}