From a36fb461addccb41d9a0cb75857efa41a9f2681e Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 1 May 2016 18:43:27 +0200 Subject: 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 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/libsyntax/parse/parser.rs') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 671a11b57de..dc7f8e4da1f 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 }; -- cgit 1.4.1-3-g733a5