about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2016-01-06 09:56:32 +1300
committerNick Cameron <ncameron@mozilla.com>2016-01-06 09:56:32 +1300
commit535282bcf57f45e45cb3a01a570ab7b9ff38ee1d (patch)
treec0d6acf778637ea5ec737d8a75928317e0989377 /src/libsyntax
parent5253294d222fe725fbbae1052d110f7eaa4ae10e (diff)
downloadrust-535282bcf57f45e45cb3a01a570ab7b9ff38ee1d.tar.gz
rust-535282bcf57f45e45cb3a01a570ab7b9ff38ee1d.zip
Cancel an error before it panics
Fixes #30715
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/parse/parser.rs11
1 files changed, 9 insertions, 2 deletions
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
                     };