Skip to content

Commit

Permalink
Upgrade rand 0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
photino committed Feb 2, 2025
1 parent a46b508 commit 23fc150
Show file tree
Hide file tree
Showing 24 changed files with 88 additions and 90 deletions.
4 changes: 2 additions & 2 deletions crates/zino-amis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ readme = "README.md"
[dependencies]
hyper-staticfile = "0.10.1"
phf = "0.11.3"
serde_json = "1.0.137"
serde_json = "1.0.138"
tracing = "0.1.41"

[dependencies.hyper]
version = "1.5.2"
version = "1.6.0"
features = ["http1", "server"]

[dependencies.hyper-util]
Expand Down
2 changes: 1 addition & 1 deletion crates/zino-auth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sqids = ["dep:sqids"]
cfg-if = "1.0"
hmac = "0.12.1"
parking_lot = "0.12.3"
rand = "0.8.5"
rand = "0.9.0"
tracing = "0.1.41"

[dependencies.jwt-simple]
Expand Down
6 changes: 3 additions & 3 deletions crates/zino-auth/src/access_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use hmac::{
digest::{FixedOutput, KeyInit, MacMarker, Update},
Hmac, Mac,
};
use rand::{distributions::Alphanumeric, Rng};
use rand::{distr::Alphanumeric, Rng};
use serde::{Deserialize, Serialize};
use std::{borrow::Cow, fmt, iter};
use zino_core::{
Expand All @@ -23,7 +23,7 @@ impl AccessKeyId {
///
/// It is generated by random alphanumeric characters.
pub fn new() -> Self {
let mut rng = rand::thread_rng();
let mut rng = rand::rng();
let chars: String = iter::repeat(())
.map(|_| rng.sample(Alphanumeric))
.map(char::from)
Expand All @@ -36,7 +36,7 @@ impl AccessKeyId {
///
/// It is generated by random alphanumeric characters.
pub fn with_length(length: u8) -> Self {
let mut rng = rand::thread_rng();
let mut rng = rand::rng();
let chars: String = iter::repeat(())
.map(|_| rng.sample(Alphanumeric))
.map(char::from)
Expand Down
2 changes: 1 addition & 1 deletion crates/zino-channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ flume = [
]

[dependencies]
serde_json = "1.0.137"
serde_json = "1.0.138"

[dependencies.ahash]
version = "0.8.11"
Expand Down
2 changes: 1 addition & 1 deletion crates/zino-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ include_dir = "0.7.4"
log = "0.4.25"
taplo = "0.13.2"
toml = "0.8.19"
toml_edit = "0.22.22"
toml_edit = "0.22.23"
tracing = "0.1.41"
tracing-subscriber = "0.3.19"
regex = "1.11.1"
Expand Down
2 changes: 1 addition & 1 deletion crates/zino-connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ version = "1.0.217"
features = ["derive"]

[dependencies.serde_json]
version = "1.0.137"
version = "1.0.138"
optional = true
features = ["raw_value"]

Expand Down
6 changes: 3 additions & 3 deletions crates/zino-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ hkdf = "0.12.4"
hmac = "0.12.1"
http = "1.2.0"
parking_lot = "0.12.3"
rand = "0.8.5"
rand = "0.9.0"
regex = "1.11.1"
rust_decimal = "1.36.0"
serde_qs = "0.13.0"
Expand Down Expand Up @@ -140,7 +140,7 @@ version = "0.24.1"
optional = true

[dependencies.metrics-exporter-prometheus]
version = "0.16.1"
version = "0.16.2"
optional = true
default-features = false
features = ["http-listener"]
Expand Down Expand Up @@ -186,7 +186,7 @@ version = "1.0.217"
features = ["derive"]

[dependencies.serde_json]
version = "1.0.137"
version = "1.0.138"
features = ["raw_value"]

[dependencies.sm3]
Expand Down
2 changes: 1 addition & 1 deletion crates/zino-core/src/crypto/aes256.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const NONCE_SIZE: usize = 12;
pub fn encrypt(plaintext: &[u8], key: &[u8]) -> Result<Vec<u8>, Error> {
let cipher = Aes256GcmSiv::new(GenericArray::from_slice(&padded_key(key)));

let mut rng = rand::thread_rng();
let mut rng = rand::rng();
let mut bytes = [0u8; NONCE_SIZE];
rng.fill(&mut bytes);

Expand Down
2 changes: 1 addition & 1 deletion crates/zino-core/src/crypto/sm4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const NONCE_SIZE: usize = 16;

/// Encrypts the plaintext using `SM4`.
pub fn encrypt(plaintext: &[u8], key: &[u8]) -> Result<Vec<u8>, Error> {
let mut rng = rand::thread_rng();
let mut rng = rand::rng();
let mut nonce = [0u8; NONCE_SIZE];
rng.fill(&mut nonce);

Expand Down
10 changes: 5 additions & 5 deletions crates/zino-core/src/mock/format/email.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use rand::{
distributions::{Alphanumeric, DistString},
seq::SliceRandom,
thread_rng, Rng,
distr::{Alphanumeric, SampleString},
seq::IndexedRandom,
Rng,
};

/// Subdomains for a mocked email address.
Expand All @@ -19,8 +19,8 @@ const ROOT_DOMAINS: [&str; 7] = ["app", "com", "dev", "edu", "gov", "net", "org"

/// Generates a random email address.
pub(crate) fn gen_email() -> String {
let mut rng = thread_rng();
let num_chars = rng.gen_range(1..=16);
let mut rng = rand::rng();
let num_chars = rng.random_range(1..=16);
let username = Alphanumeric
.sample_string(&mut rng, num_chars)
.to_lowercase();
Expand Down
12 changes: 6 additions & 6 deletions crates/zino-core/src/mock/format/ipv4.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use rand::{thread_rng, Rng};
use rand::Rng;
use std::net::Ipv4Addr;

/// Generates a random IPv4 address.
pub(crate) fn gen_ipv4() -> String {
let mut rng = thread_rng();
let a = rng.gen::<u8>();
let b = rng.gen::<u8>();
let c = rng.gen::<u8>();
let d = rng.gen::<u8>();
let mut rng = rand::rng();
let a = rng.random::<u8>();
let b = rng.random::<u8>();
let c = rng.random::<u8>();
let d = rng.random::<u8>();
Ipv4Addr::new(a, b, c, d).to_string()
}
20 changes: 10 additions & 10 deletions crates/zino-core/src/mock/format/ipv6.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use rand::{thread_rng, Rng};
use rand::Rng;
use std::net::Ipv6Addr;

/// Generates a random IPv6 address.
pub(crate) fn gen_ipv6() -> String {
let mut rng = thread_rng();
let a = rng.gen::<u16>();
let b = rng.gen::<u16>();
let c = rng.gen::<u16>();
let d = rng.gen::<u16>();
let e = rng.gen::<u16>();
let f = rng.gen::<u16>();
let g = rng.gen::<u16>();
let h = rng.gen::<u16>();
let mut rng = rand::rng();
let a = rng.random::<u16>();
let b = rng.random::<u16>();
let c = rng.random::<u16>();
let d = rng.random::<u16>();
let e = rng.random::<u16>();
let f = rng.random::<u16>();
let g = rng.random::<u16>();
let h = rng.random::<u16>();
Ipv6Addr::new(a, b, c, d, e, f, g, h).to_string()
}
10 changes: 5 additions & 5 deletions crates/zino-core/src/mock/format/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rand::{
distributions::{Alphanumeric, DistString},
thread_rng, Rng,
distr::{Alphanumeric, SampleString},
Rng,
};

mod email;
Expand All @@ -11,11 +11,11 @@ mod uri;

/// Generates a random string with the format.
pub(crate) fn gen_format(format: &str, length: Option<usize>) -> String {
let mut rng = thread_rng();
let mut rng = rand::rng();
match format {
"email" => email::gen_email(),
"ip" => {
if rng.gen::<bool>() {
if rng.random::<bool>() {
ipv6::gen_ipv6()
} else {
ipv4::gen_ipv4()
Expand All @@ -26,7 +26,7 @@ pub(crate) fn gen_format(format: &str, length: Option<usize>) -> String {
"phone-number" => phone_number::gen_phone_number(),
"uri" => uri::gen_uri(),
_ => {
let length = length.unwrap_or_else(|| rng.gen_range(1..=32));
let length = length.unwrap_or_else(|| rng.random_range(1..=32));
Alphanumeric.sample_string(&mut rng, length)
}
}
Expand Down
18 changes: 9 additions & 9 deletions crates/zino-core/src/mock/format/phone_number.rs
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
use rand::{seq::SliceRandom, thread_rng, Rng};
use rand::{seq::IndexedRandom, Rng};

/// Country codes for a mocked phone number.
const COUNTRY_CODES: [&str; 3] = ["+1", "+49", "+86"];

/// Generates a random phone number.
pub(crate) fn gen_phone_number() -> String {
let mut rng = thread_rng();
let mut rng = rand::rng();
let country_code = COUNTRY_CODES.choose(&mut rng).unwrap_or(&"+86");
let national_number = match *country_code {
"+1" => (0..10)
.map(|i| match i {
0 => rng.gen_range('2'..='9'),
1 => rng.gen_range('4'..='9'),
_ => rng.gen_range('0'..='9'),
0 => rng.random_range('2'..='9'),
1 => rng.random_range('4'..='9'),
_ => rng.random_range('0'..='9'),
})
.collect::<String>(),
"+49" => (0..11)
.map(|i| match i {
0 => '1',
1 => '7',
2 => rng.gen_range('1'..='9'),
_ => rng.gen_range('0'..='9'),
2 => rng.random_range('1'..='9'),
_ => rng.random_range('0'..='9'),
})
.collect::<String>(),
_ => (0..11)
.map(|i| match i {
0 => '1',
1 => rng.gen_range('3'..='9'),
_ => rng.gen_range('0'..='9'),
1 => rng.random_range('3'..='9'),
_ => rng.random_range('0'..='9'),
})
.collect::<String>(),
};
Expand Down
12 changes: 6 additions & 6 deletions crates/zino-core/src/mock/format/uri.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use rand::{
distributions::{Alphanumeric, DistString},
distr::{Alphanumeric, SampleString},
random,
seq::SliceRandom,
thread_rng, Rng,
seq::IndexedRandom,
Rng,
};

/// Schemes for a mocked URI.
Expand All @@ -16,11 +16,11 @@ const ROOT_DOMAINS: [&str; 3] = ["com", "net", "org"];

/// Generates a random URI.
pub(crate) fn gen_uri() -> String {
let mut rng = thread_rng();
let num_chars = rng.gen_range(1..=16);
let mut rng = rand::rng();
let num_chars = rng.random_range(1..=16);
let mut path = Alphanumeric.sample_string(&mut rng, num_chars);
if random::<bool>() {
let num_chars = rng.gen_range(1..=16);
let num_chars = rng.random_range(1..=16);
let segment = Alphanumeric.sample_string(&mut rng, num_chars);
path.push('/');
path.push_str(&segment);
Expand Down
10 changes: 5 additions & 5 deletions crates/zino-core/src/mock/sentence.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
use rand::{
distributions::{Alphanumeric, DistString},
thread_rng, Rng,
distr::{Alphanumeric, SampleString},
Rng,
};

#[cfg(feature = "locale")]
use random_word::Lang;

/// Generates a random sentence for the language.
pub(crate) fn gen_random_sentence(locale: &str, min_length: usize, max_length: usize) -> String {
let mut rng = thread_rng();
let mut length = rng.gen_range(min_length..=max_length);
let mut rng = rand::rng();
let mut length = rng.random_range(min_length..=max_length);
let mut sentence = String::with_capacity(min_length);
match locale {
#[cfg(feature = "locale-en")]
Expand Down Expand Up @@ -122,7 +122,7 @@ pub(crate) fn gen_random_sentence(locale: &str, min_length: usize, max_length: u
}
_ => {
while length > 0 {
let num_chars = rng.gen_range(1..=16);
let num_chars = rng.random_range(1..=16);
let word = Alphanumeric.sample_string(&mut rng, num_chars);
let word_length = word.len();
if let Some(remainder_length) = length.checked_sub(word_length) {
Expand Down
Loading

0 comments on commit 23fc150

Please sign in to comment.