Auto merge of #30723 - nrc:macro-err-bug, r=Manishearth

Fixes #30715
2016-01-07 04:44:14 +00:00
parent 3ed6e9e6f0 535282bcf5
commit 440671751e
2 changed files with 35 additions and 2 deletions
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2798,8 +2798,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
                    };