Skip to content

Commit 3de0d67

Browse files
authored
Rollup merge of rust-lang#102134 - flba-eb:master, r=bjorn3
Detect panic strategy using `rustc --print cfg` Instead of relying on a command line parameter, detect if a target is able to unwind or not. Ignore tests that require unwinding on targets that don't support it. I did not find any place where the removed parameter has been used, but it feels a bit risky as I'm new to this test framework. r? bjorn3
2 parents 6b001f3 + ccd19c7 commit 3de0d67

File tree

56 files changed

+23
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+23
-78
lines changed

src/test/ui/async-await/async-fn-size-moved-locals.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88
// See issue #59123 for a full explanation.
99

10-
// ignore-emscripten (sizes don't match)
1110
// needs-unwind Size of Futures change on panic=abort
1211
// run-pass
1312

src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// error-pattern: thread 'main' panicked at '`async fn` resumed after panicking'
77
// edition:2018
88
// ignore-wasm no panic or subprocess support
9-
// ignore-emscripten no panic or subprocess support
109

1110
#![feature(generators, generator_trait)]
1211

src/test/ui/binding/fn-arg-incomplete-pattern-drop-order.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// Check that partially moved from function parameters are dropped after the
44
// named bindings that move from them.
55

6-
// ignore-wasm32-bare compiled with panic=abort by default
76

87
use std::{panic, cell::RefCell};
98

src/test/ui/builtin-clone-unwind.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#![allow(unused_variables)]
55
#![allow(unused_imports)]
6-
// ignore-wasm32-bare compiled with panic=abort by default
76

87
// Test that builtin implementations of `Clone` cleanup everything
98
// in case of unwinding.

src/test/ui/catch-unwind-bang.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// needs-unwind
3-
// ignore-wasm32-bare compiled with panic=abort by default
43

54
fn worker() -> ! {
65
panic!()

src/test/ui/cfg/cfg-panic.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// build-pass
22
// compile-flags: -C panic=unwind
33
// needs-unwind
4-
// ignore-emscripten no panic_unwind implementation
5-
// ignore-wasm32 no panic_unwind implementation
6-
// ignore-wasm64 no panic_unwind implementation
74

85

96
#[cfg(panic = "abort")]

src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.fixed

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#![deny(rust_2021_incompatible_closure_captures)]
55
//~^ NOTE: the lint level is defined here
6-
// ignore-wasm32-bare compiled with panic=abort by default
76
#![feature(fn_traits)]
87
#![feature(never_type)]
98

src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#![deny(rust_2021_incompatible_closure_captures)]
55
//~^ NOTE: the lint level is defined here
6-
// ignore-wasm32-bare compiled with panic=abort by default
76
#![feature(fn_traits)]
87
#![feature(never_type)]
98

src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: changes to closure capture in Rust 2021 will affect which traits the closure implements
2-
--> $DIR/mir_calls_to_shims.rs:21:38
2+
--> $DIR/mir_calls_to_shims.rs:20:38
33
|
44
LL | let result = panic::catch_unwind(move || {
55
| ^^^^^^^

src/test/ui/drop/dynamic-drop-async.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// run-pass
77
// needs-unwind
88
// edition:2018
9-
// ignore-wasm32-bare compiled with panic=abort by default
109

1110
#![allow(unused)]
1211

0 commit comments

Comments
 (0)