diff options
| author | bors <bors@rust-lang.org> | 2016-06-29 18:44:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 18:44:27 -0700 |
| commit | c2b56fb7a0c24e04227318ca7e5950e9289ee3e4 (patch) | |
| tree | 6c202a81fd84a821d4b6731835f7bd4e68ec8a97 /src/libsyntax/parse/parser.rs | |
| parent | 5dd10012537aad9181a8ebf4216afa6193e49954 (diff) | |
| parent | 8e2598c3d2eb61e487e4ee5908f40211350a44e2 (diff) | |
| download | rust-c2b56fb7a0c24e04227318ca7e5950e9289ee3e4.tar.gz rust-c2b56fb7a0c24e04227318ca7e5950e9289ee3e4.zip | |
Auto merge of #34552 - Manishearth:rollup, r=Manishearth
Rollup of 11 pull requests - Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 813d90103b8..20a54228d01 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -553,10 +553,6 @@ impl<'a> Parser<'a> { self.expect_one_of(edible, inedible) } - pub fn commit_stmt_expecting(&mut self, edible: token::Token) -> PResult<'a, ()> { - self.commit_stmt(&[edible], &[]) - } - /// returns the span of expr, if it was not interpolated or the span of the interpolated token fn interpolated_or_expr_span(&self, expr: PResult<'a, P<Expr>>) @@ -4122,7 +4118,7 @@ impl<'a> Parser<'a> { _ => { // all other kinds of statements: let mut hi = span.hi; if classify::stmt_ends_with_semi(&node) { - self.commit_stmt_expecting(token::Semi)?; + self.commit_stmt(&[token::Semi], &[])?; hi = self.last_span.hi; } |
