Skip to content

Commit 1e91e4e

Browse files
committed
enable panic-catching tests in Miri
1 parent 083b5a0 commit 1e91e4e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/liballoc/tests/binary_heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ fn assert_covariance() {
347347
// Destructors must be called exactly once per element.
348348
// FIXME: re-enable emscripten once it can unwind again
349349
#[test]
350-
#[cfg(not(any(miri, target_os = "emscripten")))] // Miri does not support catching panics
350+
#[cfg(not(target_os = "emscripten"))]
351351
fn panic_safe() {
352352
use std::cmp;
353353
use std::panic::{self, AssertUnwindSafe};

src/liballoc/tests/vec.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -944,10 +944,9 @@ fn drain_filter_complex() {
944944
}
945945
}
946946

947-
// Miri does not support catching panics
948947
// FIXME: re-enable emscripten once it can unwind again
949948
#[test]
950-
#[cfg(not(any(miri, target_os = "emscripten")))]
949+
#[cfg(not(target_os = "emscripten"))]
951950
fn drain_filter_consumed_panic() {
952951
use std::rc::Rc;
953952
use std::sync::Mutex;
@@ -999,7 +998,7 @@ fn drain_filter_consumed_panic() {
999998

1000999
// FIXME: Re-enable emscripten once it can catch panics
10011000
#[test]
1002-
#[cfg(not(any(miri, target_os = "emscripten")))] // Miri does not support catching panics
1001+
#[cfg(not(target_os = "emscripten"))]
10031002
fn drain_filter_unconsumed_panic() {
10041003
use std::rc::Rc;
10051004
use std::sync::Mutex;

0 commit comments

Comments
 (0)