From 85bfe2d99d191d385ecb1ac4660692e9de5c4fbe Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 31 Mar 2022 13:10:53 -0400 Subject: [PATCH] make utf8_char_counts test faster in Miri --- library/alloc/tests/str.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/library/alloc/tests/str.rs b/library/alloc/tests/str.rs index 32396e35696c0..273b39aa45a48 100644 --- a/library/alloc/tests/str.rs +++ b/library/alloc/tests/str.rs @@ -2234,11 +2234,14 @@ fn utf8_chars() { #[test] fn utf8_char_counts() { let strs = [("e", 1), ("é", 1), ("€", 1), ("\u{10000}", 1), ("eé€\u{10000}", 4)]; - let mut reps = - [8, 64, 256, 512, 1024].iter().copied().flat_map(|n| n - 8..=n + 8).collect::>(); + let spread = if cfg!(miri) { 4 } else { 8 }; + let mut reps = [8, 64, 256, 512] + .iter() + .copied() + .flat_map(|n| n - spread..=n + spread) + .collect::>(); if cfg!(not(miri)) { - let big = 1 << 16; - reps.extend(big - 8..=big + 8); + reps.extend([1024, 1 << 16].iter().copied().flat_map(|n| n - spread..=n + spread)); } let counts = if cfg!(miri) { 0..1 } else { 0..8 }; let padding = counts.map(|len| " ".repeat(len)).collect::>();