From a5fb8f952bd1c0f7f22f8efbec1dae0def9b25de Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 29 Jan 2025 14:51:20 +0100 Subject: [PATCH] sort: adapt to API changes of rand --- src/uu/sort/src/sort.rs | 4 ++-- tests/by-util/test_sort.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index edff2baae..3cd424425 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -26,7 +26,7 @@ use fnv::FnvHasher; #[cfg(target_os = "linux")] use nix::libc::{getrlimit, rlimit, RLIMIT_NOFILE}; use numeric_str_cmp::{human_numeric_str_cmp, numeric_str_cmp, NumInfo, NumInfoParseSettings}; -use rand::{thread_rng, Rng}; +use rand::{rng, Rng}; use rayon::prelude::*; use std::cmp::Ordering; use std::env; @@ -1742,7 +1742,7 @@ fn general_numeric_compare(a: &GeneralF64ParseResult, b: &GeneralF64ParseResult) } fn get_rand_string() -> [u8; 16] { - thread_rng().sample(rand::distributions::Standard) + rng().sample(rand::distr::StandardUniform) } fn get_hash(t: &T) -> u64 { diff --git a/tests/by-util/test_sort.rs b/tests/by-util/test_sort.rs index 370544feb..7ed8c3b9e 100644 --- a/tests/by-util/test_sort.rs +++ b/tests/by-util/test_sort.rs @@ -1275,7 +1275,7 @@ fn test_tmp_files_deleted_on_sigint() { // approximately 20 MB for _ in 0..40 { let lines = SmallRng::seed_from_u64(123) - .sample_iter(rand::distributions::uniform::Uniform::new(0, 10000)) + .sample_iter(rand::distr::uniform::Uniform::new(0, 10000).unwrap()) .take(100_000) .map(|x| x.to_string() + "\n") .collect::();