From ff3ff5aa873efdb113758d4f6d950c07786e5e72 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Wed, 18 May 2016 09:58:51 +1200
Subject: [PATCH] Handle parser errors better

---
 src/lib.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 12258ada15c8..69f9aaebbb7b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -392,12 +392,17 @@ fn parse_input(input: Input,
         }
     };
 
-    // Bail out if the parser recovered from an error.
-    if parse_session.span_diagnostic.has_errors() {
-        return Err(None);
+    match result {
+        Ok(c) => {
+            if parse_session.span_diagnostic.has_errors() {
+                // Bail out if the parser recovered from an error.
+                Err(None)
+            } else {
+                Ok(c)
+            }
+        }
+        Err(e) => Err(Some(e)),
     }
-
-    result.map_err(|e| Some(e))
 }
 
 pub fn format_input<T: Write>(input: Input,