diff --git a/fuzz/fuzz_targets/fuzz_cksum.rs b/fuzz/fuzz_targets/fuzz_cksum.rs index 5d6968a82..d7d794a74 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 4a5215f8a..8d049bc2e 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 bfb127a5a..d31778950 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 a6441cf00..e5ce70e06 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 284089f83..df752fef4 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 77ecffabc..9a6b66e61 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 56451502b..5e838adc6 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 885ebb815..597272fbd 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 35721865e..2d441e674 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 8b38f39ec..17fcd0e5c 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 473d86f57..c3ce54504 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 1c77bf162..bb67b7e23 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 5055ec0d7..0b1e70f21 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 148ecdda1..b7d0b8a4d 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/examples/fuzzing_simulation.rs b/fuzz/uufuzz/examples/fuzzing_simulation.rs index ad7e83161..48e9dbcdf 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 e94ffd8b1..e7c135c37 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;