From 019da229648a623629570bbc9f06421867f17f81 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 28 Jan 2025 09:12:55 +0100 Subject: [PATCH 1/2] Remove rand_pcg --- Cargo.lock | 10 ---------- Cargo.toml | 1 - 2 files changed, 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d4617c48..8dc777147 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -460,7 +460,6 @@ dependencies = [ "pretty_assertions", "procfs", "rand", - "rand_pcg", "regex", "rlimit", "rstest", @@ -1831,15 +1830,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rand_pcg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" -dependencies = [ - "rand_core", -] - [[package]] name = "rayon" version = "1.10.0" diff --git a/Cargo.toml b/Cargo.toml index 98c5f7021..e5961d6eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -520,7 +520,6 @@ procfs = { version = "0.17", default-features = false } [target.'cfg(unix)'.dev-dependencies] nix = { workspace = true, features = ["process", "signal", "user", "term"] } rlimit = "0.10.1" -rand_pcg = "0.3.1" xattr = { workspace = true } # Specifically used in test_uptime::test_uptime_with_file_containing_valid_boot_time_utmpx_record From 70d6ac9812ee147147f5eff69a06a0f9719aa26a Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 28 Jan 2025 09:13:49 +0100 Subject: [PATCH 2/2] sort: use SmallRng instead of Pcg32 in test --- tests/by-util/test_sort.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/by-util/test_sort.rs b/tests/by-util/test_sort.rs index a134cbc20..370544feb 100644 --- a/tests/by-util/test_sort.rs +++ b/tests/by-util/test_sort.rs @@ -1263,6 +1263,7 @@ fn test_tmp_files_deleted_on_sigint() { use std::{fs::read_dir, time::Duration}; use nix::{sys::signal, unistd::Pid}; + use rand::rngs::SmallRng; let (at, mut ucmd) = at_and_ucmd!(); at.mkdir("tmp_dir"); @@ -1273,7 +1274,7 @@ fn test_tmp_files_deleted_on_sigint() { let mut file = at.make_file(file_name); // approximately 20 MB for _ in 0..40 { - let lines = rand_pcg::Pcg32::seed_from_u64(123) + let lines = SmallRng::seed_from_u64(123) .sample_iter(rand::distributions::uniform::Uniform::new(0, 10000)) .take(100_000) .map(|x| x.to_string() + "\n")