Cancel an error before it panics

Fixes #30715
2016-01-06 09:56:32 +13:00 · 2016-01-06 09:56:32 +13:00 · 535282bcf5
commit 535282bcf5
parent 5253294d22
2 changed files with 35 additions and 2 deletions
--- 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
                    };