Skip to content

Commit c6b4fb7

Browse files
committed
Remove panic_unwind requirement from libtest
1 parent 52e4919 commit c6b4fb7

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

src/libtest/lib.rs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@ use getopts;
3535
extern crate libc;
3636
use term;
3737

38-
// FIXME(#54291): rustc and/or LLVM don't yet support building with panic-unwind
39-
// on aarch64-pc-windows-msvc, or thumbv7a-pc-windows-msvc
40-
// so we don't link libtest against libunwind (for the time being)
41-
// even though it means that libtest won't be fully functional on
42-
// these platforms.
43-
//
44-
// See also: https://github.com/rust-lang/rust/issues/54190#issuecomment-422904437
45-
#[cfg(not(all(windows, any(target_arch = "aarch64", target_arch = "arm"))))]
46-
extern crate panic_unwind;
47-
4838
pub use self::ColorConfig::*;
4939
use self::NamePadding::*;
5040
use self::OutputLocation::*;
@@ -1488,11 +1478,7 @@ pub fn run_test(
14881478
) {
14891479
let TestDescAndFn { desc, testfn } = test;
14901480

1491-
let ignore_because_panic_abort = cfg!(target_arch = "wasm32")
1492-
&& !cfg!(target_os = "emscripten")
1493-
&& desc.should_panic != ShouldPanic::No;
1494-
1495-
if force_ignore || desc.ignore || ignore_because_panic_abort {
1481+
if force_ignore || desc.ignore {
14961482
match strategy {
14971483
RunStrategy::InProcess(tx) | RunStrategy::SpawnPrimary(tx) => {
14981484
tx.send((desc, TrIgnored, Vec::new())).unwrap();

0 commit comments

Comments
 (0)