diff options
Diffstat (limited to 'src/libregex/test/bench.rs')
| -rw-r--r-- | src/libregex/test/bench.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libregex/test/bench.rs b/src/libregex/test/bench.rs index 8dc6484a136..0e4581a401e 100644 --- a/src/libregex/test/bench.rs +++ b/src/libregex/test/bench.rs @@ -7,10 +7,12 @@ // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your // option. This file may not be copied, modified, or distributed // except according to those terms. +#![allow(non_snake_case_functions)] -use rand::{Rng, task_rng}; -use stdtest::Bencher; +use std::rand::{Rng, task_rng}; use std::str; +use stdtest::Bencher; + use regex::{Regex, NoExpand}; fn bench_assert_match(b: &mut Bencher, re: Regex, text: &str) { @@ -152,10 +154,10 @@ fn easy1() -> Regex { regex!("A[AB]B[BC]C[CD]D[DE]E[EF]F[FG]G[GH]H[HI]I[IJ]J$") fn medium() -> Regex { regex!("[XYZ]ABCDEFGHIJKLMNOPQRSTUVWXYZ$") } fn hard() -> Regex { regex!("[ -~]*ABCDEFGHIJKLMNOPQRSTUVWXYZ$") } -#[allow(deprecated_owned_vector)] fn gen_text(n: uint) -> String { let mut rng = task_rng(); - let mut bytes = rng.gen_ascii_str(n).into_bytes(); + let mut bytes = rng.gen_ascii_chars().map(|n| n as u8).take(n) + .collect::<Vec<u8>>(); for (i, b) in bytes.mut_iter().enumerate() { if i % 20 == 0 { *b = '\n' as u8 |