Merge pull request #307 from oli-obk/push-vpovvplukwyp

Also show the full output if there was a diff

Author: oli-obk

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ui_test"
-version = "0.29.0"
+version = "0.29.1"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "A test framework for testing rustc diagnostics output"

Cargo.toml

@@ -753,6 +753,11 @@ fn print_error(error: &Error, path: &Path) {
                     .green()
                 );
                 crate::diff::print_diff(expected, actual);
+
+                println!(
+                    "Full unnormalized output:\n{}",
+                    String::from_utf8_lossy(output)
+                );
             }
         }
         Error::ErrorsWithoutPattern { path, msgs } => {

src/status_emitter/text.rs

@@ -38,6 +38,25 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ba
 
  For more information about this error, try `rustc --explain E0308`.
 
+Full unnormalized output:
+error[E0308]: mismatched types
+ --> tests/actual_tests/bad_pattern.rs:4:9
+  |
+4 |     add("42", 3);
+  |     --- ^^^^ expected `usize`, found `&str`
+  |     |
+  |     arguments to this function are incorrect
+  |
+note: function defined here
+ --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC
+  |
+1 | pub fn add(left: usize, right: usize) -> usize {
+  |        ^^^
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0308`.
+
 
 error: `miesmätsched types` not found in diagnostics on line 4
  --> tests/actual_tests/bad_pattern.rs:5:17
@@ -86,6 +105,9 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ex
 -69
 +42
 
+Full unnormalized output:
+42
+
 
 full stderr:
 
@@ -193,6 +215,25 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/fo
 
  For more information about this error, try `rustc --explain E0308`.
 
+Full unnormalized output:
+error[E0308]: mismatched types
+ --> tests/actual_tests/foomp.rs:4:9
+  |
+4 |     add("42", 3);
+  |     --- ^^^^ expected `usize`, found `&str`
+  |     |
+  |     arguments to this function are incorrect
+  |
+note: function defined here
+ --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC
+  |
+1 | pub fn add(left: usize, right: usize) -> usize {
+  |        ^^^
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0308`.
+
 
 full stderr:
 error[E0308]: mismatched types
@@ -234,6 +275,25 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/fo
 
  For more information about this error, try `rustc --explain E0308`.
 
+Full unnormalized output:
+error[E0308]: mismatched types
+ --> tests/actual_tests/foomp2.rs:4:9
+  |
+4 |     add("42", 3);
+  |     --- ^^^^ expected `usize`, found `&str`
+  |     |
+  |     arguments to this function are incorrect
+  |
+note: function defined here
+ --> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC
+  |
+1 | pub fn add(left: usize, right: usize) -> usize {
+  |        ^^^
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0308`.
+
 
 full stderr:
 error[E0308]: mismatched types
@@ -1179,6 +1239,17 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ba
 -For more information about this error, try `rustc --explain E0308`.
 +For more information about this error, try `rustc --explain E0432`.
 
+Full unnormalized output:
+error[E0432]: unresolved import `basic_fail`
+ --> tests/actual_tests/bad_pattern.rs:1:5
+  |
+1 | use basic_fail::add;
+  |     ^^^^^^^^^^ use of undeclared crate or module `basic_fail`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0432`.
+
 
 error: `miesmätsched types` not found in diagnostics on line 4
  --> tests/actual_tests/bad_pattern.rs:5:17
@@ -1289,6 +1360,17 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/fo
 -For more information about this error, try `rustc --explain E0308`.
 +For more information about this error, try `rustc --explain E0432`.
 
+Full unnormalized output:
+error[E0432]: unresolved import `basic_fail`
+ --> tests/actual_tests/foomp.rs:1:5
+  |
+1 | use basic_fail::add;
+  |     ^^^^^^^^^^ use of undeclared crate or module `basic_fail`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0432`.
+
 
 error: `mismatched types` not found in diagnostics on line 4
  --> tests/actual_tests/foomp.rs:5:17
@@ -1328,6 +1410,17 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/fo
 -For more information about this error, try `rustc --explain E0308`.
 +For more information about this error, try `rustc --explain E0432`.
 
+Full unnormalized output:
+error[E0432]: unresolved import `basic_fail`
+ --> tests/actual_tests/foomp2.rs:1:5
+  |
+1 | use basic_fail::add;
+  |     ^^^^^^^^^^ use of undeclared crate or module `basic_fail`
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0432`.
+
 
 error: `mismatched types` not found in diagnostics on line 4
  --> tests/actual_tests/foomp2.rs:5:17
@@ -1428,6 +1521,29 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ru
 
  thread 'rustc' panicked
 
+Full unnormalized output:
+error: internal compiler error[E0432]: unresolved import `basic_fail`
+ --> tests/actual_tests/rustc_ice.rs:5:5
+  |
+5 | use basic_fail::add;
+  |     ^^^^^^^^^^ use of undeclared crate or module `basic_fail`
+
+thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:
+aborting due to `-Z treat-err-as-bug=1`
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+
+error: the compiler unexpectedly panicked. this is a bug.
+
+note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md
+
+
+
+note: compiler flags: -Z treat-err-as-bug
+
+query stack during panic:
+#0 [resolver_for_lowering_raw] getting the resolver for lowering
+end of query stack
+
 
 error: `mismatched types` not found in diagnostics on line 8
  --> tests/actual_tests/rustc_ice.rs:9:17