about summary refs log tree commit diff
path: root/src/liballoc/alloc
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-05-12 11:41:05 +0200
committerGitHub <noreply@github.com>2020-05-12 11:41:05 +0200
commit2a1581c50c5af46a7760f0ce9fe93d5b52818940 (patch)
treef0e74277bd214aa447f622f34db058d4bbf6dfb1 /src/liballoc/alloc
parent09c817eeb29e764cfc12d0a8d94841e3ffe34023 (diff)
parent7bea58eeac3a5a5280810623f06eadb3a8b891a3 (diff)
downloadrust-2a1581c50c5af46a7760f0ce9fe93d5b52818940.tar.gz
rust-2a1581c50c5af46a7760f0ce9fe93d5b52818940.zip
Rollup merge of #71737 - RalfJung:miri-test-threads, r=shepmaster
Miri: run liballoc tests with threads

Miri now supports threads, so we can run these tests. :)
Diffstat (limited to 'src/liballoc/alloc')
-rw-r--r--src/liballoc/alloc/tests.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/alloc/tests.rs b/src/liballoc/alloc/tests.rs
index 1ad40eca93b..1c003983df9 100644
--- a/src/liballoc/alloc/tests.rs
+++ b/src/liballoc/alloc/tests.rs
@@ -23,7 +23,7 @@ fn allocate_zeroed() {
 }
 
 #[bench]
-#[cfg_attr(miri, ignore)] // Miri does not support benchmarks
+#[cfg_attr(miri, ignore)] // isolated Miri does not support benchmarks
 fn alloc_owned_small(b: &mut Bencher) {
     b.iter(|| {
         let _: Box<_> = box 10;