diff options
| author | bors <bors@rust-lang.org> | 2017-09-10 12:48:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-10 12:48:55 +0000 |
| commit | d290dec97f8bace2a2585505518b109b1e368f4c (patch) | |
| tree | b3973604ffde6b7dce3897b531a7faaf8c0aeb69 /src/libsyntax/parse | |
| parent | 23aaeb573b626a51af9ecc97680663153e4ab2b0 (diff) | |
| parent | 8a7d93bf6f5b1a699bafec6f59964a3962b2e927 (diff) | |
| download | rust-d290dec97f8bace2a2585505518b109b1e368f4c.tar.gz rust-d290dec97f8bace2a2585505518b109b1e368f4c.zip | |
Auto merge of #44474 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 13 pull requests - Successful merges: #44262, #44329, #44332, #44347, #44372, #44384, #44387, #44396, #44449, #44451, #44457, #44464, #44467 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 1f033b25fe4..a52d0488307 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4699,7 +4699,7 @@ impl<'a> Parser<'a> { SeqSep::trailing_allowed(token::Comma), |p| p.parse_fn_block_arg() ); - self.bump(); + self.expect(&token::BinOp(token::Or))?; args } }; |