From dcb53d754bed44ad72edf19889daf06e54a70a5b Mon Sep 17 00:00:00 2001
From: keatinge <willy.keatinge@gmail.com>
Date: Sat, 6 Jan 2018 10:01:54 -0500
Subject: [PATCH] Emit non-fatal error instead

---
 src/libsyntax/parse/parser.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index e7c46bfd7bc5..3fd73418df55 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3431,15 +3431,17 @@ impl<'a> Parser<'a> {
         let mut pats = Vec::new();
         loop {
             pats.push(self.parse_pat()?);
-            if self.check(&token::BinOp(token::Or)) { self.bump();}
-            else {
-                // Accidental use of || instead of | inbetween patterns
-                if self.token == token::OrOr {
-                    return Err(self.span_fatal_help(
-                           self.span, "unexpected token `||` after pattern",
-                           "did you mean to use `|` to specify multiple patterns instead?"));
-                }
 
+            if self.token == token::OrOr {
+                self.span_err_help(self.span,
+                                   "unexpected token `||` after pattern",
+                                   "did you mean to use `|` to specify multiple patterns?");
+                self.bump();
+            }
+            else if self.check(&token::BinOp(token::Or)) {
+                self.bump();
+            }
+            else {
                 return Ok(pats);
             }
         };