Update proc-macro tests

Due to #59998, the panic hook fires incorrectly for errors that should
not be treated as ICEs. Previously, this would only print the default
panic message, but moving the ICE printing into the panic handler will
now print the entire ICE ordeal we all hate to see.

Unfortunately this will make #59998 a lot more visible.

diff --git a/src/test/ui/proc-macro/invalid-punct-ident-1.rs b/src/test/ui/proc-macro/invalid-punct-ident-1.rs
index c9881ad2c38afc2a846d07580f44938cd610a668..3b6498b4b0ee901d80dc5cc6d6f63869174999e3 100644 (file)
--- a/src/test/ui/proc-macro/invalid-punct-ident-1.rs
+++ b/src/test/ui/proc-macro/invalid-punct-ident-1.rs
@@ -3,6 +3,11 @@
 // FIXME https://github.com/rust-lang/rust/issues/59998
 // normalize-stderr-test "thread.*panicked.*proc_macro_server.rs.*\n" -> ""
 // normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+// normalize-stderr-test "error: internal compiler error.*\n" -> ""
+// normalize-stderr-test "note:.*unexpectedly panicked.*\n" -> ""
+// normalize-stderr-test "note: we would appreciate a bug report.*\n" -> ""
+// normalize-stderr-test "note: compiler flags.*\n" -> ""
+// normalize-stderr-test "note: rustc.*running on.*\n" -> ""
 
 #[macro_use]
 extern crate invalid_punct_ident;

diff --git a/src/test/ui/proc-macro/invalid-punct-ident-1.stderr b/src/test/ui/proc-macro/invalid-punct-ident-1.stderr
index 40333a3f4c2113c510b9f4e9e95ed6ffb91f4082..107f5fb515b1cdd5852ac94ddb39f715a6c939d7 100644 (file)
--- a/src/test/ui/proc-macro/invalid-punct-ident-1.stderr
+++ b/src/test/ui/proc-macro/invalid-punct-ident-1.stderr
@@ -1,5 +1,5 @@
 error: proc macro panicked
-  --> $DIR/invalid-punct-ident-1.rs:10:1
+  --> $DIR/invalid-punct-ident-1.rs:15:1
    |
 LL | invalid_punct!();
    | ^^^^^^^^^^^^^^^^^

diff --git a/src/test/ui/proc-macro/invalid-punct-ident-2.rs b/src/test/ui/proc-macro/invalid-punct-ident-2.rs
index 15e2286a650498f2fa14f63ae16097a77c21d7b7..ee57752e2be27c985b786292c84bf81e4925e7dd 100644 (file)
--- a/src/test/ui/proc-macro/invalid-punct-ident-2.rs
+++ b/src/test/ui/proc-macro/invalid-punct-ident-2.rs
@@ -3,6 +3,11 @@
 // FIXME https://github.com/rust-lang/rust/issues/59998
 // normalize-stderr-test "thread.*panicked.*proc_macro_server.rs.*\n" -> ""
 // normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+// normalize-stderr-test "error: internal compiler error.*\n" -> ""
+// normalize-stderr-test "note:.*unexpectedly panicked.*\n" -> ""
+// normalize-stderr-test "note: we would appreciate a bug report.*\n" -> ""
+// normalize-stderr-test "note: compiler flags.*\n" -> ""
+// normalize-stderr-test "note: rustc.*running on.*\n" -> ""
 
 #[macro_use]
 extern crate invalid_punct_ident;

diff --git a/src/test/ui/proc-macro/invalid-punct-ident-2.stderr b/src/test/ui/proc-macro/invalid-punct-ident-2.stderr
index ec97e265c3fcdc23a97afbc49d1e8e43a039a303..f1b9ecc6cbfe4552ef7e8ac198a5dc6a67076d48 100644 (file)
--- a/src/test/ui/proc-macro/invalid-punct-ident-2.stderr
+++ b/src/test/ui/proc-macro/invalid-punct-ident-2.stderr
@@ -1,5 +1,5 @@
 error: proc macro panicked
-  --> $DIR/invalid-punct-ident-2.rs:10:1
+  --> $DIR/invalid-punct-ident-2.rs:15:1
    |
 LL | invalid_ident!();
    | ^^^^^^^^^^^^^^^^^

diff --git a/src/test/ui/proc-macro/invalid-punct-ident-3.rs b/src/test/ui/proc-macro/invalid-punct-ident-3.rs
index 629bbaa9e388889608dbdac51fd1105c37696b47..efcd6801ecbdd3496f10ed8ba9c4c0da96ae2e24 100644 (file)
--- a/src/test/ui/proc-macro/invalid-punct-ident-3.rs
+++ b/src/test/ui/proc-macro/invalid-punct-ident-3.rs
@@ -3,6 +3,11 @@
 // FIXME https://github.com/rust-lang/rust/issues/59998
 // normalize-stderr-test "thread.*panicked.*proc_macro_server.rs.*\n" -> ""
 // normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+// normalize-stderr-test "error: internal compiler error.*\n" -> ""
+// normalize-stderr-test "note:.*unexpectedly panicked.*\n" -> ""
+// normalize-stderr-test "note: we would appreciate a bug report.*\n" -> ""
+// normalize-stderr-test "note: compiler flags.*\n" -> ""
+// normalize-stderr-test "note: rustc.*running on.*\n" -> ""
 
 #[macro_use]
 extern crate invalid_punct_ident;

diff --git a/src/test/ui/proc-macro/invalid-punct-ident-3.stderr b/src/test/ui/proc-macro/invalid-punct-ident-3.stderr
index a5e5ded65333abd8f695d0cb5e9708c2662196e3..6044b9887401e1acd29160ef17749376091bc5d3 100644 (file)
--- a/src/test/ui/proc-macro/invalid-punct-ident-3.stderr
+++ b/src/test/ui/proc-macro/invalid-punct-ident-3.stderr
@@ -1,5 +1,5 @@
 error: proc macro panicked
-  --> $DIR/invalid-punct-ident-3.rs:10:1
+  --> $DIR/invalid-punct-ident-3.rs:15:1
    |
 LL | invalid_raw_ident!();
    | ^^^^^^^^^^^^^^^^^^^^^