]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #48338 - estebank:match-missing-comma, r=petrochenkov
authorManish Goregaokar <manishsmail@gmail.com>
Sat, 3 Mar 2018 06:01:23 +0000 (22:01 -0800)
committerManish Goregaokar <manishsmail@gmail.com>
Sat, 3 Mar 2018 06:01:23 +0000 (22:01 -0800)
Fixes #47311.
r? @nrc

1  2 
src/libsyntax/parse/parser.rs

index 881e3e412d4eb4052db4debcabd1a5a8fcf1e9b3,69b2723449849230b777c67a04166f98879574e1..92584f5b51946151c4ebb36ffc2510b9b1d462a3
@@@ -3820,10 -3873,15 +3889,13 @@@ impl<'a> Parser<'a> 
                      }
                      token::OpenDelim(token::Paren) => {
                          if qself.is_some() {
-                             return Err(self.fatal("unexpected `(` after qualified path"));
+                             let msg = "unexpected `(` after qualified path";
+                             let mut err = self.fatal(msg);
+                             err.span_label(self.span, msg);
+                             return Err(err);
                          }
                          // Parse tuple struct or enum pattern
 -                        self.bump();
 -                        let (fields, ddpos) = self.parse_pat_tuple_elements(false)?;
 -                        self.expect(&token::CloseDelim(token::Paren))?;
 +                        let (fields, ddpos, _) = self.parse_parenthesized_pat_list()?;
                          pat = PatKind::TupleStruct(path, fields, ddpos)
                      }
                      _ => pat = PatKind::Path(qself, path),