Skip to content

Commit 217a82a

Browse files
authored
Rollup merge of rust-lang#101741 - andrewpollack:add-needs-unwind-ui-tests, r=tmandry
Adding needs-unwind arg to applicable compiler ui tests Adding `needs-unwind` arg to applicable compiler ui tests
2 parents fffb7f2 + 5d27f19 commit 217a82a

18 files changed

+21
-11
lines changed

src/test/ui/asm/x86_64/may_unwind.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// only-x86_64
22
// run-pass
33
// needs-asm-support
4+
// needs-unwind
45

56
#![feature(asm_sym, asm_unwind)]
67

src/test/ui/mir/mir_codegen_calls_diverging_drops.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// error-pattern:diverging_fn called
33
// error-pattern:0 dropped
44
// ignore-emscripten no processes
5+
// needs-unwind this test checks that a destructor is called after panicking
56

67
struct Droppable(u8);
78
impl Drop for Droppable {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// aux-build:invalid-punct-ident.rs
2+
// needs-unwind proc macro panics to report errors
23

34
#[macro_use]
45
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:6:1
2+
--> $DIR/invalid-punct-ident-1.rs:7:1
33
|
44
LL | invalid_punct!();
55
| ^^^^^^^^^^^^^^^^

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// aux-build:invalid-punct-ident.rs
2+
// needs-unwind proc macro panics to report errors
23

34
#[macro_use]
45
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:6:1
2+
--> $DIR/invalid-punct-ident-2.rs:7:1
33
|
44
LL | invalid_ident!();
55
| ^^^^^^^^^^^^^^^^

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// aux-build:invalid-punct-ident.rs
2+
// needs-unwind proc macro panics to report errors
23

34
#[macro_use]
45
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:6:1
2+
--> $DIR/invalid-punct-ident-3.rs:7:1
33
|
44
LL | invalid_raw_ident!();
55
| ^^^^^^^^^^^^^^^^^^^^

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// aux-build:invalid-punct-ident.rs
2+
// needs-unwind proc macro panics to report errors
23

34
#[macro_use]
45
extern crate invalid_punct_ident;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
error: unexpected closing delimiter: `)`
2-
--> $DIR/invalid-punct-ident-4.rs:6:1
2+
--> $DIR/invalid-punct-ident-4.rs:7:1
33
|
44
LL | lexer_failure!();
55
| ^^^^^^^^^^^^^^^^ unexpected closing delimiter
66
|
77
= note: this error originates in the macro `lexer_failure` (in Nightly builds, run with -Z macro-backtrace for more info)
88

99
error: proc macro panicked
10-
--> $DIR/invalid-punct-ident-4.rs:6:1
10+
--> $DIR/invalid-punct-ident-4.rs:7:1
1111
|
1212
LL | lexer_failure!();
1313
| ^^^^^^^^^^^^^^^^
1414

1515
error[E0308]: mismatched types
16-
--> $DIR/invalid-punct-ident-4.rs:11:33
16+
--> $DIR/invalid-punct-ident-4.rs:12:33
1717
|
1818
LL | let _recovery_witness: () = 0;
1919
| -- ^ expected `()`, found integer

0 commit comments

Comments
 (0)