diff options
| author | bors <bors@rust-lang.org> | 2017-02-10 04:50:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-10 04:50:08 +0000 |
| commit | f80514426aaf59967e08f32ec44c1876cdeffe9d (patch) | |
| tree | 86ec1b1290f4d2d3fbe6e4dcc46332c87a407c22 /src/libsyntax/parse | |
| parent | 24a70eb598a76edb0941f628a87946b40f2a1c83 (diff) | |
| parent | 84ad5157937d27db02479a4aa329ea0365e88130 (diff) | |
| download | rust-f80514426aaf59967e08f32ec44c1876cdeffe9d.tar.gz rust-f80514426aaf59967e08f32ec44c1876cdeffe9d.zip | |
Auto merge of #39712 - frewsxcv:rollup, r=frewsxcv
Rollup of 6 pull requests - Successful merges: #39587, #39674, #39693, #39700, #39705, #39707 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 45d8354d317..b051928ff9d 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -802,6 +802,10 @@ impl<'a> Parser<'a> { let mut first: bool = true; let mut v = vec![]; while !kets.contains(&&self.token) { + match self.token { + token::CloseDelim(..) | token::Eof => break, + _ => {} + }; match sep.sep { Some(ref t) => { if first { @@ -2608,9 +2612,12 @@ impl<'a> Parser<'a> { return Ok((None, kleene_op)); } - let separator = self.bump_and_get(); + let separator = match self.token { + token::CloseDelim(..) => None, + _ => Some(self.bump_and_get()), + }; match parse_kleene_op(self)? { - Some(zerok) => Ok((Some(separator), zerok)), + Some(zerok) => Ok((separator, zerok)), None => return Err(self.fatal("expected `*` or `+`")) } } @@ -2647,7 +2654,7 @@ impl<'a> Parser<'a> { tts: tts, }))) }, - token::CloseDelim(_) | token::Eof => unreachable!(), + token::CloseDelim(..) | token::Eof => Ok(TokenTree::Token(self.span, token::Eof)), token::Dollar | token::SubstNt(..) if self.quote_depth > 0 => self.parse_unquoted(), _ => Ok(TokenTree::Token(self.span, self.bump_and_get())), } |
