Skip to content

Commit f33ec5e

Browse files
committed
Fix deprecation warnings on libregex tests
1 parent 3e6b29f commit f33ec5e

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/libregex/test/bench.rs

+10-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
use std::rand::{Rng, task_rng};
1313
use stdtest::Bencher;
14+
use std::iter::repeat;
1415

1516
use regex::{Regex, NoExpand};
1617

@@ -22,38 +23,38 @@ fn bench_assert_match(b: &mut Bencher, re: Regex, text: &str) {
2223
fn no_exponential(b: &mut Bencher) {
2324
let n = 100;
2425
let re = Regex::new(format!("{}{}",
25-
"a?".repeat(n),
26-
"a".repeat(n)).as_slice()).unwrap();
27-
let text = "a".repeat(n);
26+
repeat("a?").take(n).collect::<String>(),
27+
repeat("a").take(n).collect::<String>()).as_slice()).unwrap();
28+
let text = repeat("a").take(n).collect::<String>();
2829
bench_assert_match(b, re, text.as_slice());
2930
}
3031

3132
#[bench]
3233
fn literal(b: &mut Bencher) {
3334
let re = regex!("y");
34-
let text = format!("{}y", "x".repeat(50));
35+
let text = format!("{}y", repeat("x").take(50).collect::<String>());
3536
bench_assert_match(b, re, text.as_slice());
3637
}
3738

3839
#[bench]
3940
fn not_literal(b: &mut Bencher) {
4041
let re = regex!(".y");
41-
let text = format!("{}y", "x".repeat(50));
42+
let text = format!("{}y", repeat("x").take(50).collect::<String>());
4243
bench_assert_match(b, re, text.as_slice());
4344
}
4445

4546
#[bench]
4647
fn match_class(b: &mut Bencher) {
4748
let re = regex!("[abcdw]");
48-
let text = format!("{}w", "xxxx".repeat(20));
49+
let text = format!("{}w", repeat("xxxx").take(20).collect::<String>());
4950
bench_assert_match(b, re, text.as_slice());
5051
}
5152

5253
#[bench]
5354
fn match_class_in_range(b: &mut Bencher) {
5455
// 'b' is between 'a' and 'c', so the class range checking doesn't help.
5556
let re = regex!("[ac]");
56-
let text = format!("{}c", "bbbb".repeat(20));
57+
let text = format!("{}c", repeat("bbbb").take(20).collect::<String>());
5758
bench_assert_match(b, re, text.as_slice());
5859
}
5960

@@ -77,7 +78,7 @@ fn anchored_literal_short_non_match(b: &mut Bencher) {
7778
#[bench]
7879
fn anchored_literal_long_non_match(b: &mut Bencher) {
7980
let re = regex!("^zbc(d|e)");
80-
let text = "abcdefghijklmnopqrstuvwxyz".repeat(15);
81+
let text = repeat("abcdefghijklmnopqrstuvwxyz").take(15).collect::<String>();
8182
b.iter(|| re.is_match(text.as_slice()));
8283
}
8384

@@ -91,7 +92,7 @@ fn anchored_literal_short_match(b: &mut Bencher) {
9192
#[bench]
9293
fn anchored_literal_long_match(b: &mut Bencher) {
9394
let re = regex!("^.bc(d|e)");
94-
let text = "abcdefghijklmnopqrstuvwxyz".repeat(15);
95+
let text = repeat("abcdefghijklmnopqrstuvwxyz").take(15).collect::<String>();
9596
b.iter(|| re.is_match(text.as_slice()));
9697
}
9798

0 commit comments

Comments
 (0)