Skip to content

Commit 9501b86

Browse files
committed
chore(pact_ffi): Update rand and rand_regex crates
1 parent 89254a9 commit 9501b86

3 files changed

Lines changed: 24 additions & 32 deletions

File tree

rust/Cargo.lock

Lines changed: 14 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/pact_ffi/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ pact_models = { version = "~1.3.7" }
3636
pact-plugin-driver = { version = "~0.7.5" }
3737
pact_verifier = { version = "~1.3.2", path = "../pact_verifier" }
3838
panic-message = "0.3.0"
39-
rand = "0.8.5"
40-
rand_regex = "0.15.1"
39+
rand = "0.9.2"
40+
rand_regex = "0.18.1"
4141
regex = "1.12.2"
42-
regex-syntax = "0.6.29"
42+
regex-syntax = "0.8.8"
4343
serde = { version = "1.0.228", features = ["derive"] }
4444
serde_json = "1.0.149"
4545
serde_urlencoded = "0.7.1"

rust/pact_ffi/src/mock_server/mod.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ use chrono::Local;
5454
use either::Either;
5555
use libc::c_char;
5656
use onig::Regex;
57-
use rand::prelude::*;
57+
use rand::Rng;
5858
use serde_json::{json, Value};
5959
use tracing::{error, info, warn};
6060
use uuid::Uuid;
@@ -568,15 +568,13 @@ pub fn generate_regex_value_internal(regex: &str) -> Result<String, String> {
568568
let mut parser = regex_syntax::ParserBuilder::new().unicode(false).build();
569569
match parser.parse(regex) {
570570
Ok(hir) => {
571-
let mut rnd = rand::thread_rng();
572-
let gen = rand_regex::Regex::with_hir(hir, 20).unwrap();
573-
let result: String = rnd.sample(gen);
574-
Ok(result)
571+
let mut rnd = rand::rng();
572+
match rand_regex::Regex::with_hir(hir, 20) {
573+
Ok(re) => Ok(rnd.sample(re)),
574+
Err(err) => Err(format!("generate_regex_value: '{}' is not a valid regular expression - {}", regex, err))
575+
}
575576
},
576-
Err(err) => {
577-
let error = format!("generate_regex_value: '{}' is not a valid regular expression - {}", regex, err);
578-
Err(error)
579-
}
577+
Err(err) => Err(format!("generate_regex_value: '{}' is not a valid regular expression - {}", regex, err))
580578
}
581579
}
582580

0 commit comments

Comments
 (0)