From a36fb461addccb41d9a0cb75857efa41a9f2681e Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 1 May 2016 18:43:27 +0200
Subject: [PATCH] parser: fix suppression of syntax errors in range RHS

Invalid expressions on the RHS were just swallowed without generating
an error.  The new code more closely mirrors the code for parsing
`..x` in the `parse_prefix_range_expr` method, where no cancel is done
either.

Fixes #33262.
---
 src/libsyntax/parse/parser.rs      | 11 ++---------
 src/test/parse-fail/issue-33262.rs | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 src/test/parse-fail/issue-33262.rs

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 671a11b57dec1..dc7f8e4da1f7e 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3029,15 +3029,8 @@ impl<'a> Parser<'a> {
                 // We have 2 alternatives here: `x..y`/`x...y` and `x..`/`x...` The other
                 // two variants are handled with `parse_prefix_range_expr` call above.
                 let rhs = if self.is_at_start_of_range_notation_rhs() {
-                    let rhs = self.parse_assoc_expr_with(op.precedence() + 1,
-                                                         LhsExpr::NotYetParsed);
-                    match rhs {
-                        Ok(e) => Some(e),
-                        Err(mut e) => {
-                            e.cancel();
-                            None
-                        }
-                    }
+                    Some(self.parse_assoc_expr_with(op.precedence() + 1,
+                                                    LhsExpr::NotYetParsed)?)
                 } else {
                     None
                 };
diff --git a/src/test/parse-fail/issue-33262.rs b/src/test/parse-fail/issue-33262.rs
new file mode 100644
index 0000000000000..d6bbfdc59f5c6
--- /dev/null
+++ b/src/test/parse-fail/issue-33262.rs
@@ -0,0 +1,18 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags: -Z parse-only
+
+// Issue #33262
+
+pub fn main() {
+    for i in 0..a as { }
+    //~^ ERROR expected type, found `{`
+}