From d85407692aaf85da5f5015f46571926be302429a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E9=80=B8?= Date: Fri, 4 Apr 2025 21:52:37 +0800 Subject: [PATCH] test: update rand --- Cargo.toml | 2 +- test/sys/test_sockopt.rs | 4 ++-- test/sys/test_uio.rs | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 559f0b6a45..f5f0a5e2ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,7 +75,7 @@ zerocopy = ["fs", "uio"] [dev-dependencies] assert-impl = "0.1" parking_lot = "0.12" -rand = "0.8" +rand = "0.9" tempfile = "3.7.1" semver = "1.0.7" nix = { path = ".", features = ["acct", "aio", "dir", "env", "event", "fanotify", diff --git a/test/sys/test_sockopt.rs b/test/sys/test_sockopt.rs index 4e5a9187e0..e3e8586118 100644 --- a/test/sys/test_sockopt.rs +++ b/test/sys/test_sockopt.rs @@ -4,7 +4,7 @@ use nix::sys::socket::{ getsockopt, setsockopt, socket, sockopt, AddressFamily, SockFlag, SockProtocol, SockType, }; -use rand::{thread_rng, Rng}; +use rand::{rng, Rng}; use std::os::unix::io::{AsRawFd, FromRawFd, OwnedFd}; // NB: FreeBSD supports LOCAL_PEERCRED for SOCK_SEQPACKET, but OSX does not. @@ -124,7 +124,7 @@ fn test_so_buf() { SockProtocol::Udp, ) .unwrap(); - let bufsize: usize = thread_rng().gen_range(4096..131_072); + let bufsize: usize = rng().random_range(4096..131_072); setsockopt(&fd, sockopt::SndBuf, &bufsize).unwrap(); let actual = getsockopt(&fd, sockopt::SndBuf).unwrap(); assert!(actual >= bufsize); diff --git a/test/sys/test_uio.rs b/test/sys/test_uio.rs index 43f2f7a01e..38f35fa5d9 100644 --- a/test/sys/test_uio.rs +++ b/test/sys/test_uio.rs @@ -1,7 +1,7 @@ use nix::sys::uio::*; use nix::unistd::*; -use rand::distributions::Alphanumeric; -use rand::{thread_rng, Rng}; +use rand::distr::Alphanumeric; +use rand::{rng, Rng}; use std::fs::OpenOptions; use std::io::IoSlice; use std::{cmp, iter}; @@ -19,7 +19,7 @@ use tempfile::tempfile; fn test_writev() { let mut to_write = Vec::with_capacity(16 * 128); for _ in 0..16 { - let s: String = thread_rng() + let s: String = rng() .sample_iter(&Alphanumeric) .map(char::from) .take(128) @@ -35,7 +35,7 @@ fn test_writev() { let slice_len = if left <= 64 { left } else { - thread_rng().gen_range(64..cmp::min(256, left)) + rng().random_range(64..cmp::min(256, left)) }; let b = &to_write[consumed..consumed + slice_len]; iovecs.push(IoSlice::new(b)); @@ -61,7 +61,7 @@ fn test_writev() { #[test] #[cfg(not(target_os = "redox"))] fn test_readv() { - let s: String = thread_rng() + let s: String = rng() .sample_iter(&Alphanumeric) .map(char::from) .take(128) @@ -74,7 +74,7 @@ fn test_readv() { let vec_len = if left <= 64 { left } else { - thread_rng().gen_range(64..cmp::min(256, left)) + rng().random_range(64..cmp::min(256, left)) }; let v: Vec = iter::repeat(0u8).take(vec_len).collect(); storage.push(v);