Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit df13721

Browse files
committed
Remove workarounds for issue 59998
1 parent 6098e79 commit df13721

11 files changed

+5
-35
lines changed

src/test/ui/proc-macro/invalid-punct-ident-1.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
// aux-build:invalid-punct-ident.rs
2-
// ignore-stage1
3-
// only-linux
4-
//
5-
// FIXME: This should be a normal (stage1, all platforms) test in
6-
// src/test/ui/proc-macro once issue #59998 is fixed.
72

83
#[macro_use]
94
extern crate invalid_punct_ident;

src/test/ui/proc-macro/invalid-punct-ident-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: proc macro panicked
2-
--> $DIR/invalid-punct-ident-1.rs:11:1
2+
--> $DIR/invalid-punct-ident-1.rs:6:1
33
|
44
LL | invalid_punct!();
55
| ^^^^^^^^^^^^^^^^

src/test/ui/proc-macro/invalid-punct-ident-2.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
// aux-build:invalid-punct-ident.rs
2-
// ignore-stage1
3-
// only-linux
4-
//
5-
// FIXME: This should be a normal (stage1, all platforms) test in
6-
// src/test/ui/proc-macro once issue #59998 is fixed.
72

83
#[macro_use]
94
extern crate invalid_punct_ident;

src/test/ui/proc-macro/invalid-punct-ident-2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: proc macro panicked
2-
--> $DIR/invalid-punct-ident-2.rs:11:1
2+
--> $DIR/invalid-punct-ident-2.rs:6:1
33
|
44
LL | invalid_ident!();
55
| ^^^^^^^^^^^^^^^^

src/test/ui/proc-macro/invalid-punct-ident-3.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
// aux-build:invalid-punct-ident.rs
2-
// ignore-stage1
3-
// only-linux
4-
//
5-
// FIXME: This should be a normal (stage1, all platforms) test in
6-
// src/test/ui/proc-macro once issue #59998 is fixed.
72

83
#[macro_use]
94
extern crate invalid_punct_ident;

src/test/ui/proc-macro/invalid-punct-ident-3.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: proc macro panicked
2-
--> $DIR/invalid-punct-ident-3.rs:11:1
2+
--> $DIR/invalid-punct-ident-3.rs:6:1
33
|
44
LL | invalid_raw_ident!();
55
| ^^^^^^^^^^^^^^^^^^^^

src/test/ui-fulldeps/issue-76270-panic-in-libproc-macro.rs renamed to src/test/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
// aux-build:proc-macro-panic.rs
22
// edition:2018
3-
// ignore-stage1
4-
// only-linux
5-
//
6-
// FIXME: This should be a normal (stage1, all platforms) test in
7-
// src/test/ui/proc-macro once issue #59998 is fixed.
83

94
// Regression test for issue #76270
105
// Tests that we don't print an ICE message when a panic

src/test/ui-fulldeps/issue-76270-panic-in-libproc-macro.stderr renamed to src/test/ui/proc-macro/issue-76270-panic-in-libproc-macro.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: proc macro panicked
2-
--> $DIR/issue-76270-panic-in-libproc-macro.rs:15:1
2+
--> $DIR/issue-76270-panic-in-libproc-macro.rs:10:1
33
|
44
LL | proc_macro_panic::panic_in_libproc_macro!();
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/test/ui/proc-macro/load-panic-backtrace.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
// aux-build:test-macros.rs
22
// compile-flags: -Z proc-macro-backtrace
33
// rustc-env:RUST_BACKTRACE=0
4-
5-
// FIXME https://github.com/rust-lang/rust/issues/59998
64
// normalize-stderr-test "thread '.*' panicked " -> ""
75
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
8-
// normalize-stderr-test "\nerror: internal compiler error.*\n\n" -> ""
9-
// normalize-stderr-test "note:.*unexpectedly panicked.*\n\n" -> ""
10-
// normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> ""
11-
// normalize-stderr-test "note: compiler flags.*\n\n" -> ""
12-
// normalize-stderr-test "note: rustc.*running on.*\n\n" -> ""
13-
// normalize-stderr-test "query stack during panic:\n" -> ""
14-
// normalize-stderr-test "we're just showing a limited slice of the query stack\n" -> ""
15-
// normalize-stderr-test "end of query stack\n" -> ""
166

177
#[macro_use]
188
extern crate test_macros;

src/test/ui/proc-macro/load-panic-backtrace.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
at 'panic-derive', $DIR/auxiliary/test-macros.rs:43:5
22
error: proc-macro derive panicked
3-
--> $DIR/load-panic-backtrace.rs:20:10
3+
--> $DIR/load-panic-backtrace.rs:10:10
44
|
55
LL | #[derive(Panic)]
66
| ^^^^^

0 commit comments

Comments
 (0)