about summary refs log tree commit diff
path: root/src/liballoc/tests/binary_heap.rs
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-04-17 10:31:37 +0200
committerGitHub <noreply@github.com>2019-04-17 10:31:37 +0200
commiteb958e1b2e498f4751ac7c36cb2aeb4ce2ab68a0 (patch)
tree6e1c2fac1877bdabc52c519385f0af67527fee65 /src/liballoc/tests/binary_heap.rs
parent23e8aaf4719972884ca825165a0de3ac8a2aaf9e (diff)
parentd55e4b7a259b887202be91708f839a75b234697c (diff)
downloadrust-eb958e1b2e498f4751ac7c36cb2aeb4ce2ab68a0.tar.gz
rust-eb958e1b2e498f4751ac7c36cb2aeb4ce2ab68a0.zip
Rollup merge of #60018 - RalfJung:miri-test-libstd, r=oli-obk
Miri now supports entropy, but is still slow

Adjust the `cfg` and their comments in the test suites accordingly.
Diffstat (limited to 'src/liballoc/tests/binary_heap.rs')
-rw-r--r--src/liballoc/tests/binary_heap.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/tests/binary_heap.rs b/src/liballoc/tests/binary_heap.rs
index 0930f8dacd4..0685fa943c0 100644
--- a/src/liballoc/tests/binary_heap.rs
+++ b/src/liballoc/tests/binary_heap.rs
@@ -282,7 +282,7 @@ fn assert_covariance() {
 //
 // Destructors must be called exactly once per element.
 #[test]
-#[cfg(not(miri))] // Miri does not support panics nor entropy
+#[cfg(not(miri))] // Miri does not support catching panics
 fn panic_safe() {
     static DROP_COUNTER: AtomicUsize = AtomicUsize::new(0);