fuzz: adapt to API changes of rand

Author: cakebaker

fuzz/fuzz_targets/fuzz_common.rs

@@ -5,7 +5,7 @@
 
 use libc::STDIN_FILENO;
 use libc::{close, dup, dup2, pipe, STDERR_FILENO, STDOUT_FILENO};
-use rand::prelude::SliceRandom;
+use rand::prelude::IndexedRandom;
 use rand::Rng;
 use similar::TextDiff;
 use std::env::temp_dir;
@@ -373,15 +373,15 @@ fn print_diff(rust_output: &str, gnu_output: &str) {
 }
 
 pub fn generate_random_string(max_length: usize) -> String {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let valid_utf8: Vec<char> = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
         .chars()
         .collect();
     let invalid_utf8 = [0xC3, 0x28]; // Invalid UTF-8 sequence
     let mut result = String::new();
 
-    for _ in 0..rng.gen_range(0..=max_length) {
-        if rng.gen_bool(0.9) {
+    for _ in 0..rng.random_range(0..=max_length) {
+        if rng.random_bool(0.9) {
             let ch = valid_utf8.choose(&mut rng).unwrap();
             result.push(*ch);
         } else {
@@ -396,18 +396,18 @@ pub fn generate_random_string(max_length: usize) -> String {
 }
 
 pub fn generate_random_file() -> Result<String, std::io::Error> {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let file_name: String = (0..10)
-        .map(|_| rng.gen_range(b'a'..=b'z') as char)
+        .map(|_| rng.random_range(b'a'..=b'z') as char)
         .collect();
     let mut file_path = temp_dir();
     file_path.push(file_name);
 
     let mut file = File::create(&file_path)?;
 
-    let content_length = rng.gen_range(10..1000);
+    let content_length = rng.random_range(10..1000);
     let content: String = (0..content_length)
-        .map(|_| (rng.gen_range(b' '..=b'~') as char))
+        .map(|_| (rng.random_range(b' '..=b'~') as char))
         .collect();
 
     file.write_all(content.as_bytes())?;

fuzz/fuzz_targets/fuzz_cut.rs

@@ -18,19 +18,19 @@ use crate::fuzz_common::{
 static CMD_PATH: &str = "cut";
 
 fn generate_cut_args() -> String {
-    let mut rng = rand::thread_rng();
-    let arg_count = rng.gen_range(1..=6);
+    let mut rng = rand::rng();
+    let arg_count = rng.random_range(1..=6);
     let mut args = Vec::new();
 
     for _ in 0..arg_count {
-        if rng.gen_bool(0.1) {
-            args.push(generate_random_string(rng.gen_range(1..=20)));
+        if rng.random_bool(0.1) {
+            args.push(generate_random_string(rng.random_range(1..=20)));
         } else {
             match rng.gen_range(0..=4) {
-                0 => args.push(String::from("-b") + &rng.gen_range(1..=10).to_string()),
-                1 => args.push(String::from("-c") + &rng.gen_range(1..=10).to_string()),
+                0 => args.push(String::from("-b") + &rng.random_range(1..=10).to_string()),
+                1 => args.push(String::from("-c") + &rng.random_range(1..=10).to_string()),
                 2 => args.push(String::from("-d,") + &generate_random_string(1)), // Using a comma as a default delimiter
-                3 => args.push(String::from("-f") + &rng.gen_range(1..=5).to_string()),
+                3 => args.push(String::from("-f") + &rng.random_range(1..=5).to_string()),
                 _ => (),
             }
         }
@@ -40,12 +40,12 @@ fn generate_cut_args() -> String {
 }
 
 fn generate_delimited_data(count: usize) -> String {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let mut lines = Vec::new();
 
     for _ in 0..count {
-        let fields = (0..rng.gen_range(1..=5))
-            .map(|_| generate_random_string(rng.gen_range(1..=10)))
+        let fields = (0..rng.random_range(1..=5))
+            .map(|_| generate_random_string(rng.random_range(1..=10)))
             .collect::<Vec<_>>()
             .join(",");
         lines.push(fields);

fuzz/fuzz_targets/fuzz_sort.rs

@@ -20,7 +20,7 @@ use crate::fuzz_common::{
 static CMD_PATH: &str = "sort";
 
 fn generate_sort_args() -> String {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
     let arg_count = rng.gen_range(1..=5);
     let mut args = Vec::new();
@@ -30,20 +30,20 @@ fn generate_sort_args() -> String {
             0 => args.push(String::from("-r")), // Reverse the result of comparisons
             1 => args.push(String::from("-n")), // Compare according to string numerical value
             2 => args.push(String::from("-f")), // Fold lower case to upper case characters
-            3 => args.push(generate_random_string(rng.gen_range(1..=10))), // Random string (to simulate file names)
-            _ => args.push(String::from("-k") + &rng.gen_range(1..=5).to_string()), // Sort via a specified field
+            3 => args.push(generate_random_string(rng.random_range(1..=10))), // Random string (to simulate file names)
+            _ => args.push(String::from("-k") + &rng.random_range(1..=5).to_string()), // Sort via a specified field
         }
     }
 
     args.join(" ")
 }
 
 fn generate_random_lines(count: usize) -> String {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let mut lines = Vec::new();
 
     for _ in 0..count {
-        lines.push(generate_random_string(rng.gen_range(1..=20)));
+        lines.push(generate_random_string(rng.random_range(1..=20)));
     }
 
     lines.join("\n")