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

Issue #50636: Improve error diagnostic with missing commas after struct fields.

Browse source
This commit is contained in:
Simon Martin 2018-05-20 06:43:11 +02:00
parent c95e1cccc9
commit e6bf3e2ddb
3 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libsyntax/parse/parser.rs
View file

@ -5797,9 +5797,18 @@ impl<'a> Parser<'a> {
return Err(err);
}
}
_ => return Err(self.span_fatal_help(self.span,
&format!("expected `,`, or `}}`, found `{}`", self.this_token_to_string()),
"struct fields should be separated by commas")),
_ => {
let sp = self.sess.codemap().next_point(self.prev_span);
let mut err = self.struct_span_err(sp, &format!("expected `,`, or `}}`, found `{}`",
self.this_token_to_string()));
if self.token.is_ident() {
// This is likely another field; emit the diagnostic and keep going
err.span_suggestion(sp, "try adding a comma", ",".into());
err.emit();
} else {
return Err(err)
}
}
}
Ok(a_var)
}