Merge pull request #178 from Alexendoo/bless-1.73

Bless panic output change from Rust 1.73

Author: oli-obk

tests/integration.rs

@@ -45,6 +45,7 @@ fn main() -> Result<()> {
         "No such file or directory",
     );
     config.filter("RUSTC_BOOTSTRAP=\"1\" ", "");
+    config.filter("RUSTC_ICE=\"0\" ", "");
     // The order of the `/deps` directory flag is flaky
     config.stdout_filter("/deps", "");
     config.path_filter(std::path::Path::new(path), "$DIR");

tests/integrations/basic-fail/Cargo.stderr

@@ -6,10 +6,11 @@ error: test failed, to rerun pass `--test ui_tests`
 
 Caused by:
   process didn't exit successfully: `$DIR/target/ui/$DIR/debug/deps/ui_tests-HASH` (exit status: 1)
-thread 'main' panicked at 'invalid mode/result combo: yolo: Err(tests failed
+thread 'main' panicked at tests/ui_tests_bless.rs:52:18:
+invalid mode/result combo: yolo: Err(tests failed
 
 Location:
-    $DIR/src/lib.rs:LL:CC)', tests/ui_tests_bless.rs:52:18
+    $DIR/src/lib.rs:LL:CC)
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 error: test failed, to rerun pass `--test ui_tests_bless`
 Error: failed to parse rustc version info: invalid_foobarlaksdfalsdfj

tests/integrations/basic-fail/Cargo.stdout

@@ -234,28 +234,29 @@ command: "rustc" "--error-format=json" "--extern" "basic_fail=$DIR/$DIR/../../..
 
 error: fail test got exit status: 101, but expected 1
 
-error: `mismatched types` not found in diagnostics on line 10
-  --> tests/actual_tests/rustc_ice.rs:11:17
-   |
-11 |     //~^ ERROR: mismatched types
-   |                 ^^^^^^^^^^^^^^^^ expected because of this pattern
-   |
+error: `mismatched types` not found in diagnostics on line 8
+ --> tests/actual_tests/rustc_ice.rs:9:17
+  |
+9 |     //~^ ERROR: mismatched types
+  |                 ^^^^^^^^^^^^^^^^ expected because of this pattern
+  |
 
 error: there were 1 unmatched diagnostics
-  --> tests/actual_tests/rustc_ice.rs:10:5
-   |
-10 |     add("42", 3);
-   |     ^^^^^^^^^^^^ Ice: no errors reported for args
-   |
+ --> tests/actual_tests/rustc_ice.rs:8:5
+  |
+8 |     add("42", 3);
+  |     ^^^^^^^^^^^^ Ice: no errors reported for args
+  |
 
 full stderr:
 error: internal compiler error: no errors reported for args
-  --> tests/actual_tests/rustc_ice.rs:10:5
-   |
-10 |     add("42", 3);
-   |     ^^^^^^^^^^^^
+ --> tests/actual_tests/rustc_ice.rs:8:5
+  |
+8 |     add("42", 3);
+  |     ^^^^^^^^^^^^
 
-thread 'rustc' panicked at 'aborting due to `-Z treat-err-as-bug=1`', compiler/rustc_errors/src/lib.rs
+thread 'rustc' panicked at compiler/rustc_errors/src/lib.rs:
+aborting due to `-Z treat-err-as-bug=1`
 stack backtrace:
 
 error: the compiler unexpectedly panicked. this is a bug.
@@ -268,8 +269,7 @@ note: compiler flags: -Z treat-err-as-bug
 
 query stack during panic:
 #0 [typeck] type-checking `main`
-#1 [used_trait_imports] finding used_trait_imports `main`
-#2 [analysis] running analysis passes on this crate
+#1 [analysis] running analysis passes on this crate
 end of query stack
 
 full stdout:

tests/integrations/basic-fail/tests/actual_tests/rustc_ice.rs

@@ -1,9 +1,7 @@
 //@compile-flags: -Ztreat-err-as-bug
 //@rustc-env: RUSTC_BOOTSTRAP=1
-//@normalize-stderr-test: " +[0-9]+: .*\n" -> ""
-//@normalize-stderr-test: "                +at \.?/.*\n" -> ""
-//@normalize-stderr-test: " running on .*" -> ""
-//@normalize-stderr-test: "note: rustc 1\..*" -> ""
+//@rustc-env: RUSTC_ICE=0
+//@normalize-stderr-test: "(?s)(thread 'rustc' panicked).*end of query stack" -> "$1"
 use basic_fail::add;
 
 fn main() {

tests/integrations/basic-fail/tests/actual_tests/rustc_ice.stderr

@@ -1,22 +1,7 @@
 error: internal compiler error: no errors reported for args
-  --> $DIR/rustc_ice.rs:10:5
-   |
-10 |     add("42", 3);
-   |     ^^^^^^^^^^^^
+ --> $DIR/rustc_ice.rs:8:5
+  |
+8 |     add("42", 3);
+  |     ^^^^^^^^^^^^
 
-thread 'rustc' panicked at 'aborting due to `-Z treat-err-as-bug=1`', compiler/rustc_errors/src/lib.rs:1712:30
-stack 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 [typeck] type-checking `main`
-#1 [used_trait_imports] finding used_trait_imports `main`
-#2 [analysis] running analysis passes on this crate
-end of query stack
+thread 'rustc' panicked

tests/integrations/basic-fail/tests/actual_tests_bless/failing_executable.run.stderr

@@ -1,4 +1,5 @@
-thread 'main' panicked at 'assertion failed: `(left == right)`
-  left: `5`,
- right: `6`', $DIR/failing_executable.rs:4:5
+thread 'main' panicked at $DIR/failing_executable.rs:4:5:
+assertion `left == right` failed
+  left: 5
+ right: 6
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.panic.stderr

@@ -1,2 +1,3 @@
-thread 'main' panicked at 'explicit panic', $DIR/revisioned_executable_panic.rs:6:5
+thread 'main' panicked at $DIR/revisioned_executable_panic.rs:6:5:
+explicit panic
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/integrations/basic-fail/tests/actual_tests_bless/revisioned_executable_panic.run.run.stderr

@@ -1,2 +1,3 @@
-thread 'main' panicked at 'explicit panic', $DIR/revisioned_executable_panic.rs:6:5
+thread 'main' panicked at $DIR/revisioned_executable_panic.rs:6:5:
+explicit panic
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/integrations/basic-fail/tests/actual_tests_bless/run_panic.run.stderr

@@ -1,2 +1,3 @@
-thread 'main' panicked at 'explicit panic', $DIR/run_panic.rs:4:5
+thread 'main' panicked at $DIR/run_panic.rs:4:5:
+explicit panic
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/integrations/cargo-run/tests/actual_tests/empty_no_stdin.stderr

@@ -1,2 +1,3 @@
-thread 'main' panicked at 'done', src/main.rs:12:5
+thread 'main' panicked at src/main.rs:12:5:
+done
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace