diff options
| author | bors <bors@rust-lang.org> | 2018-02-04 22:58:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-04 22:58:10 +0000 |
| commit | e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470 (patch) | |
| tree | 3495f1e9721731384fae0e1c2a6209fd1402a76f /src/libsyntax/parse | |
| parent | 0c6091fbd0eee290c651f73be899f221eeab3c05 (diff) | |
| parent | e17ebdf344401c265ade3b02bb68df0d0485d71a (diff) | |
| download | rust-e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470.tar.gz rust-e7e982ac03b496dd4d4b5c182fdcd5fb4f2b5470.zip | |
Auto merge of #47998 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #47862, #47877, #47896, #47912, #47947, #47958, #47978, #47996, #47999, #47892 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b3c485a85c0..764b3d0a848 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3398,11 +3398,7 @@ impl<'a> Parser<'a> { let attrs = self.parse_outer_attributes()?; // Allow a '|' before the pats (RFC 1925) - let beginning_vert = if self.eat(&token::BinOp(token::Or)) { - Some(self.prev_span) - } else { - None - }; + self.eat(&token::BinOp(token::Or)); let pats = self.parse_pats()?; let guard = if self.eat_keyword(keywords::If) { Some(self.parse_expr()?) @@ -3426,7 +3422,6 @@ impl<'a> Parser<'a> { pats, guard, body: expr, - beginning_vert, }) } |
