From 535282bcf57f45e45cb3a01a570ab7b9ff38ee1d Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Wed, 6 Jan 2016 09:56:32 +1300
Subject: [PATCH] Cancel an error before it panics

Fixes #30715
---
 src/libsyntax/parse/parser.rs        | 11 +++++++++--
 src/test/compile-fail/issue-30715.rs | 26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 src/test/compile-fail/issue-30715.rs

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index db746af998d..a3318b1e8fa 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2793,8 +2793,15 @@ impl<'a> Parser<'a> {
                     // We have 2 alternatives here: `x..y` and `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() {
-                        self.parse_assoc_expr_with(op.precedence() + 1,
-                                                   LhsExpr::NotYetParsed).ok()
+                        let rhs = self.parse_assoc_expr_with(op.precedence() + 1,
+                                                             LhsExpr::NotYetParsed);
+                        match rhs {
+                            Ok(e) => Some(e),
+                            Err(mut e) => {
+                                e.cancel();
+                                None
+                            }
+                        }
                     } else {
                         None
                     };
diff --git a/src/test/compile-fail/issue-30715.rs b/src/test/compile-fail/issue-30715.rs
new file mode 100644
index 00000000000..16761905cb9
--- /dev/null
+++ b/src/test/compile-fail/issue-30715.rs
@@ -0,0 +1,26 @@
+// 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.
+
+macro_rules! parallel {
+    (
+        for $id:ident in $iter:expr {
+            $( $inner:expr; )*
+        }
+    ) => {};
+}
+
+
+fn main() {
+    parallel! {
+        for i in 0..n {
+            x += i; //~ ERROR no rules expected the token `+=`
+        }
+    }
+}