about summary refs log tree commit diff
path: root/src/liballoc/collections
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-04-24 13:14:26 +0200
committerGitHub <noreply@github.com>2020-04-24 13:14:26 +0200
commit08ca4472679057539e71fdb78b9e45e74c6932db (patch)
tree93240efca356cd1318e475709d0de0750f5ba0d5 /src/liballoc/collections
parentaa9053a3e76ecf2a35fecee5e83e5b27582cf9df (diff)
parenteb1de2ff39de631e9fd880f1e066fbe119b23f99 (diff)
downloadrust-08ca4472679057539e71fdb78b9e45e74c6932db.tar.gz
rust-08ca4472679057539e71fdb78b9e45e74c6932db.zip
Rollup merge of #71476 - RalfJung:miri-test-sizes, r=kennytm
more compact way to adjust test sizes for Miri

Inspired by @dtolnay
Diffstat (limited to 'src/liballoc/collections')
-rw-r--r--src/liballoc/collections/vec_deque/tests.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/liballoc/collections/vec_deque/tests.rs b/src/liballoc/collections/vec_deque/tests.rs
index 8ef5ec78e05..0a3f3300323 100644
--- a/src/liballoc/collections/vec_deque/tests.rs
+++ b/src/liballoc/collections/vec_deque/tests.rs
@@ -386,10 +386,8 @@ fn test_vec_from_vecdeque() {
         assert!(vec.into_iter().eq(vd));
     }
 
-    #[cfg(not(miri))] // Miri is too slow
-    let max_pwr = 7;
-    #[cfg(miri)]
-    let max_pwr = 5;
+    // Miri is too slow
+    let max_pwr = if cfg!(miri) { 5 } else { 7 };
 
     for cap_pwr in 0..max_pwr {
         // Make capacity as a (2^x)-1, so that the ring size is 2^x