diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-04-01 12:07:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 12:07:05 +0200 |
| commit | b81d235974911be790ae75ecab72bb3a8d2a85d6 (patch) | |
| tree | 45576b53c1175f2a6c7c74e80f2faead37c08c8c | |
| parent | f37bca4d7cf574476b6adb4ff459affd971dd610 (diff) | |
| parent | 85bfe2d99d191d385ecb1ac4660692e9de5c4fbe (diff) | |
| download | rust-b81d235974911be790ae75ecab72bb3a8d2a85d6.tar.gz rust-b81d235974911be790ae75ecab72bb3a8d2a85d6.zip | |
Rollup merge of #95532 - RalfJung:utf8_char_counts, r=Dylan-DPC
make utf8_char_counts test faster in Miri This currently takes >3min on GHA, so let's reduce the test size a bit more for Miri.
| -rw-r--r-- | library/alloc/tests/str.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/library/alloc/tests/str.rs b/library/alloc/tests/str.rs index 32396e35696..273b39aa45a 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::<Vec<usize>>(); + 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::<Vec<usize>>(); 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::<Vec<String>>(); |
