Output the full output along with the line

Author: Jonathan Turner

src/tools/compiletest/src/json.rs

@@ -57,11 +57,11 @@ struct DiagnosticCode {
 
 pub fn parse_output(file_name: &str, output: &str) -> Vec<Error> {
     output.lines()
-          .flat_map(|line| parse_line(file_name, line))
+          .flat_map(|line| parse_line(file_name, line, output))
           .collect()
 }
 
-fn parse_line(file_name: &str, line: &str) -> Vec<Error> {
+fn parse_line(file_name: &str, line: &str, output: &str) -> Vec<Error> {
     // The compiler sometimes intermingles non-JSON stuff into the
     // output.  This hack just skips over such lines. Yuck.
     if line.chars().next() == Some('{') {
@@ -72,8 +72,8 @@ fn parse_line(file_name: &str, line: &str) -> Vec<Error> {
                 expected_errors
             }
             Err(error) => {
-                panic!("failed to decode compiler output as json: `{}` when parsing: {}", error,
-                    line);
+                panic!("failed to decode compiler output as json: `{}`\noutput: {}\nline: {}",
+                    error, line, output);
             }
         }
     } else {