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

Rollup merge of #77444 - estebank:pat-field-label, r=davidtwco

Browse source 
Fix span for incorrect pattern field and add label

Address #73750.
This commit is contained in:
Jonas Schievink 2020-10-02 20:27:16 +02:00 • committed by GitHub
commit de8d7aa400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_parse/src/parser/pat.rs
View file

@ -795,6 +795,7 @@ impl<'a> Parser<'a> {
}
self.bump();
let (fields, etc) = self.parse_pat_fields().unwrap_or_else(|mut e| {
e.span_label(path.span, "while parsing the fields for this pattern");
e.emit();
self.recover_stmt();
(vec![], true)
@ -844,7 +845,7 @@ impl<'a> Parser<'a> {
// check that a comma comes after every field
if !ate_comma {
let err = self.struct_span_err(self.prev_token.span, "expected `,`");
let err = self.struct_span_err(self.token.span, "expected `,`");
if let Some(mut delayed) = delayed_err {
delayed.emit();
}