diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 07a681bf25a..f279798fe6e 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -231,9 +231,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.59" +version = "1.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" +checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" dependencies = [ "find-msvc-tools", "jobserver", @@ -261,7 +261,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" dependencies = [ "cfg-if", "cpufeatures 0.3.0", - "rand_core 0.10.0", + "rand_core", ] [[package]] @@ -734,7 +734,7 @@ dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", - "rand_core 0.10.0", + "rand_core", "wasip2", "wasip3", ] @@ -762,9 +762,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" [[package]] name = "heck" @@ -1083,12 +1083,12 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" [[package]] name = "indexmap" -version = "2.13.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "serde", "serde_core", ] @@ -1197,9 +1197,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.94" +version = "0.3.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9" +checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" dependencies = [ "once_cell", "wasm-bindgen", @@ -1452,15 +1452,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" @@ -1525,16 +1516,6 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" -[[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.1" @@ -1543,26 +1524,7 @@ checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ "chacha20", "getrandom 0.4.2", - "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]] @@ -2083,7 +2045,7 @@ dependencies = [ "itertools", "memchr", "nix", - "rand 0.10.1", + "rand", "rayon", "self_cell", "tempfile", @@ -2194,7 +2156,7 @@ name = "uucore-fuzz" version = "0.0.0" dependencies = [ "libfuzzer-sys", - "rand 0.9.2", + "rand", "uu_cksum", "uu_cut", "uu_date", @@ -2227,7 +2189,7 @@ version = "0.8.0" dependencies = [ "console", "libc", - "rand 0.9.2", + "rand", "similar", "tempfile", "uucore", @@ -2271,9 +2233,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0" +checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" dependencies = [ "cfg-if", "once_cell", @@ -2284,9 +2246,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be" +checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2294,9 +2256,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2" +checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" dependencies = [ "bumpalo", "proc-macro2", @@ -2307,9 +2269,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.117" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b" +checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" dependencies = [ "unicode-ident", ] @@ -2575,26 +2537,6 @@ version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6e61e59a957b7ccee15d2049f86e8bfd6f66968fcd88f018950662d9b86e675" -[[package]] -name = "zerocopy" -version = "0.8.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "zerofrom" version = "0.1.7" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 81edb902c71..3149df76a22 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.1", 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 2ca4ff9f3dd..7479feae905 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.1", features = ["std_rng"] } similar = "3.0.0" uucore = { version = "0.8.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;