diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 9fa3351cd87..0d931b1448d 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -252,7 +252,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "rand_core 0.10.0", + "rand_core", ] [[package]] @@ -683,7 +683,7 @@ dependencies = [ "cfg-if", "libc", "r-efi", - "rand_core 0.10.0", + "rand_core", "wasip2", "wasip3", ] @@ -1397,15 +1397,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - [[package]] name = "prettyplease" version = "0.2.37" @@ -1464,16 +1455,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "rand" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -dependencies = [ - "rand_chacha", - "rand_core 0.9.5", -] - [[package]] name = "rand" version = "0.10.0" @@ -1482,26 +1463,7 @@ checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" dependencies = [ "chacha20", "getrandom 0.4.1", - "rand_core 0.10.0", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", -] - -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", + "rand_core", ] [[package]] @@ -2018,7 +1980,7 @@ dependencies = [ "itertools", "memchr", "nix", - "rand 0.10.0", + "rand", "rayon", "self_cell", "tempfile", @@ -2128,7 +2090,7 @@ name = "uucore-fuzz" version = "0.0.0" dependencies = [ "libfuzzer-sys", - "rand 0.9.2", + "rand", "uu_cksum", "uu_cut", "uu_date", @@ -2161,7 +2123,7 @@ version = "0.7.0" dependencies = [ "console", "libc", - "rand 0.9.2", + "rand", "similar", "tempfile", "uucore", @@ -2583,26 +2545,6 @@ version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b3a41ce106832b4da1c065baa4c31cf640cf965fa1483816402b7f6b96f0a64" -[[package]] -name = "zerocopy" -version = "0.8.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "zerofrom" version = "0.1.6" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 81edb902c71..01177974f72 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -27,7 +27,7 @@ debug = true [dependencies] libfuzzer-sys = "0.4.7" -rand = { version = "0.9.0", features = ["small_rng"] } +rand = { version = "0.10.0", features = ["std_rng"] } uufuzz = { path = "uufuzz" } uucore = { path = "../src/uucore", features = ["parser"] } uu_date = { path = "../src/uu/date" } diff --git a/fuzz/fuzz_targets/fuzz_cksum.rs b/fuzz/fuzz_targets/fuzz_cksum.rs index be93a96050e..34d3579a76b 100644 --- a/fuzz/fuzz_targets/fuzz_cksum.rs +++ b/fuzz/fuzz_targets/fuzz_cksum.rs @@ -6,7 +6,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use rand::Rng; +use rand::RngExt; use std::env::temp_dir; use std::ffi::OsString; use std::fs::{self, File}; diff --git a/fuzz/fuzz_targets/fuzz_cut.rs b/fuzz/fuzz_targets/fuzz_cut.rs index 4a5215f8aec..8d049bc2e51 100644 --- a/fuzz/fuzz_targets/fuzz_cut.rs +++ b/fuzz/fuzz_targets/fuzz_cut.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_cut::uumain; -use rand::Rng; +use rand::RngExt; use std::ffi::OsString; use uufuzz::{ diff --git a/fuzz/fuzz_targets/fuzz_dirname.rs b/fuzz/fuzz_targets/fuzz_dirname.rs index bfb127a5a5a..d31778950a7 100644 --- a/fuzz/fuzz_targets/fuzz_dirname.rs +++ b/fuzz/fuzz_targets/fuzz_dirname.rs @@ -7,7 +7,7 @@ use libfuzzer_sys::fuzz_target; use uu_dirname::uumain; -use rand::Rng; +use rand::RngExt; use rand::prelude::IndexedRandom; use std::ffi::OsString; diff --git a/fuzz/fuzz_targets/fuzz_echo.rs b/fuzz/fuzz_targets/fuzz_echo.rs index a6441cf00d1..e5ce70e06e5 100644 --- a/fuzz/fuzz_targets/fuzz_echo.rs +++ b/fuzz/fuzz_targets/fuzz_echo.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_echo::uumain; -use rand::Rng; +use rand::RngExt; use rand::prelude::IndexedRandom; use std::ffi::OsString; @@ -51,7 +51,7 @@ fn generate_echo() -> String { echo_str } -fn generate_escape_sequence(rng: &mut impl Rng) -> String { +fn generate_escape_sequence(rng: &mut impl RngExt) -> String { let escape_sequences = [ "\\\\", "\\a", "\\b", "\\c", "\\e", "\\f", "\\n", "\\r", "\\t", "\\v", "\\0NNN", "\\xHH", ]; diff --git a/fuzz/fuzz_targets/fuzz_env.rs b/fuzz/fuzz_targets/fuzz_env.rs index 284089f8378..df752fef4f8 100644 --- a/fuzz/fuzz_targets/fuzz_env.rs +++ b/fuzz/fuzz_targets/fuzz_env.rs @@ -10,7 +10,7 @@ use uu_env::uumain; use std::ffi::OsString; -use rand::Rng; +use rand::RngExt; use uufuzz::{ CommandResult, compare_result, generate_and_run_uumain, generate_random_string, run_gnu_cmd, }; diff --git a/fuzz/fuzz_targets/fuzz_expr.rs b/fuzz/fuzz_targets/fuzz_expr.rs index 77ecffabc1b..9a6b66e612d 100644 --- a/fuzz/fuzz_targets/fuzz_expr.rs +++ b/fuzz/fuzz_targets/fuzz_expr.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_expr::uumain; -use rand::Rng; +use rand::RngExt; use rand::prelude::IndexedRandom; use std::{env, ffi::OsString}; diff --git a/fuzz/fuzz_targets/fuzz_non_utf8_paths.rs b/fuzz/fuzz_targets/fuzz_non_utf8_paths.rs index 56451502ba9..5e838adc6ce 100644 --- a/fuzz/fuzz_targets/fuzz_non_utf8_paths.rs +++ b/fuzz/fuzz_targets/fuzz_non_utf8_paths.rs @@ -7,7 +7,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use rand::Rng; +use rand::RngExt; use rand::prelude::IndexedRandom; use std::collections::HashSet; use std::env::temp_dir; diff --git a/fuzz/fuzz_targets/fuzz_printf.rs b/fuzz/fuzz_targets/fuzz_printf.rs index 885ebb815bf..597272fbdf3 100644 --- a/fuzz/fuzz_targets/fuzz_printf.rs +++ b/fuzz/fuzz_targets/fuzz_printf.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_printf::uumain; -use rand::Rng; +use rand::RngExt; use rand::seq::IndexedRandom; use std::env; use std::ffi::OsString; @@ -18,7 +18,7 @@ use uufuzz::{compare_result, generate_and_run_uumain, generate_random_string, ru static CMD_PATH: &str = "printf"; -fn generate_escape_sequence(rng: &mut impl Rng) -> String { +fn generate_escape_sequence(rng: &mut impl RngExt) -> String { let escape_sequences = [ "\\\"", "\\\\", diff --git a/fuzz/fuzz_targets/fuzz_seq.rs b/fuzz/fuzz_targets/fuzz_seq.rs index 35721865e8c..2d441e6742f 100644 --- a/fuzz/fuzz_targets/fuzz_seq.rs +++ b/fuzz/fuzz_targets/fuzz_seq.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_seq::uumain; -use rand::Rng; +use rand::RngExt; use std::ffi::OsString; use uufuzz::CommandResult; diff --git a/fuzz/fuzz_targets/fuzz_sort.rs b/fuzz/fuzz_targets/fuzz_sort.rs index 8b38f39ec1b..17fcd0e5c51 100644 --- a/fuzz/fuzz_targets/fuzz_sort.rs +++ b/fuzz/fuzz_targets/fuzz_sort.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_sort::uumain; -use rand::Rng; +use rand::RngExt; use std::env; use std::ffi::OsString; diff --git a/fuzz/fuzz_targets/fuzz_split.rs b/fuzz/fuzz_targets/fuzz_split.rs index 473d86f575f..c3ce54504c6 100644 --- a/fuzz/fuzz_targets/fuzz_split.rs +++ b/fuzz/fuzz_targets/fuzz_split.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_split::uumain; -use rand::Rng; +use rand::RngExt; use std::ffi::OsString; use uufuzz::{ diff --git a/fuzz/fuzz_targets/fuzz_test.rs b/fuzz/fuzz_targets/fuzz_test.rs index 1c77bf1629b..bb67b7e2307 100644 --- a/fuzz/fuzz_targets/fuzz_test.rs +++ b/fuzz/fuzz_targets/fuzz_test.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_test::uumain; -use rand::Rng; +use rand::RngExt; use rand::prelude::IndexedRandom; use std::ffi::OsString; @@ -35,7 +35,7 @@ struct TestArg { arg_type: ArgType, } -fn generate_random_path(rng: &mut dyn rand::RngCore) -> &'static str { +fn generate_random_path(rng: &mut dyn rand::Rng) -> &'static str { match rng.random_range(0..=3) { 0 => "/dev/null", 1 => "/dev/random", diff --git a/fuzz/fuzz_targets/fuzz_tr.rs b/fuzz/fuzz_targets/fuzz_tr.rs index 5055ec0d748..0b1e70f21c8 100644 --- a/fuzz/fuzz_targets/fuzz_tr.rs +++ b/fuzz/fuzz_targets/fuzz_tr.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use std::ffi::OsString; use uu_tr::uumain; -use rand::Rng; +use rand::RngExt; use uufuzz::{ CommandResult, compare_result, generate_and_run_uumain, generate_random_string, run_gnu_cmd, diff --git a/fuzz/fuzz_targets/fuzz_wc.rs b/fuzz/fuzz_targets/fuzz_wc.rs index 148ecdda1fc..b7d0b8a4de6 100644 --- a/fuzz/fuzz_targets/fuzz_wc.rs +++ b/fuzz/fuzz_targets/fuzz_wc.rs @@ -8,7 +8,7 @@ use libfuzzer_sys::fuzz_target; use uu_wc::uumain; -use rand::Rng; +use rand::RngExt; use std::ffi::OsString; use uufuzz::{ diff --git a/fuzz/uufuzz/Cargo.toml b/fuzz/uufuzz/Cargo.toml index 4480061763c..2233d5a7e1f 100644 --- a/fuzz/uufuzz/Cargo.toml +++ b/fuzz/uufuzz/Cargo.toml @@ -11,7 +11,7 @@ license.workspace = true [dependencies] console = "0.16.0" libc = "0.2.153" -rand = { version = "0.9.0", features = ["small_rng"] } +rand = { version = "0.10.0" } similar = "2.5.0" uucore = { version = "0.7.0", path = "../../src/uucore", features = ["parser"] } tempfile = "3.15.0" diff --git a/fuzz/uufuzz/examples/fuzzing_simulation.rs b/fuzz/uufuzz/examples/fuzzing_simulation.rs index ad7e8316114..48e9dbcdf94 100644 --- a/fuzz/uufuzz/examples/fuzzing_simulation.rs +++ b/fuzz/uufuzz/examples/fuzzing_simulation.rs @@ -3,7 +3,7 @@ // For the full copyright and license information, please view the LICENSE // file that was distributed with this source code. -use rand::Rng; +use rand::RngExt; use std::ffi::OsString; use uufuzz::{generate_and_run_uumain, generate_random_string, run_gnu_cmd}; diff --git a/fuzz/uufuzz/src/lib.rs b/fuzz/uufuzz/src/lib.rs index e94ffd8b189..e7c135c3703 100644 --- a/fuzz/uufuzz/src/lib.rs +++ b/fuzz/uufuzz/src/lib.rs @@ -9,7 +9,7 @@ use libc::{STDERR_FILENO, STDOUT_FILENO, close, dup, dup2, pipe}; use pretty_print::{ print_diff, print_end_with_status, print_or_empty, print_section, print_with_style, }; -use rand::Rng; +use rand::RngExt; use rand::prelude::IndexedRandom; use std::env::temp_dir; use std::ffi::OsString;