diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-11-22 17:33:26 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-12-07 05:27:58 -0500 |
| commit | 2ec959fc35a8b0bdab13c03fcce9c90a929e9bd7 (patch) | |
| tree | 2f60661ebe46929bbe329177d584311a8def7fb9 /src/tools/compiletest | |
| parent | e5dc4ba2808ac81d7b3a1abab303e6d9eda5d9d6 (diff) | |
| download | rust-2ec959fc35a8b0bdab13c03fcce9c90a929e9bd7.tar.gz rust-2ec959fc35a8b0bdab13c03fcce9c90a929e9bd7.zip | |
extend MIR dump with detailed, extra information
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 91d51d359ec..a18f4ec1aad 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2535,7 +2535,10 @@ impl<'test> TestCx<'test> { let mut dumped_file = fs::File::open(output_file.clone()).unwrap(); let mut dumped_string = String::new(); dumped_file.read_to_string(&mut dumped_string).unwrap(); - let mut dumped_lines = dumped_string.lines().filter(|l| !l.is_empty()); + let mut dumped_lines = dumped_string + .lines() + .map(|l| nocomment_mir_line(l)) + .filter(|l| !l.is_empty()); let mut expected_lines = expected_content .iter() .filter(|&l| { @@ -2573,7 +2576,7 @@ impl<'test> TestCx<'test> { .join("\n"); panic!( "Did not find expected line, error: {}\n\ - Actual Line: {:?}\n\ + Expected Line: {:?}\n\ Expected:\n{}\n\ Actual:\n{}", extra_msg, @@ -2599,7 +2602,9 @@ impl<'test> TestCx<'test> { error( expected_line, format!( - "Mismatch in lines\nCurrnt block: {}\nExpected Line: {:?}", + "Mismatch in lines\n\ + Current block: {}\n\ + Actual Line: {:?}", start_block_line.unwrap_or("None"), dumped_line ), |