tests: update to rand 0.10 (#818)

Author: tottoto

.github/workflows/ci.yml

@@ -76,6 +76,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - uses: dtolnay/rust-toolchain@stable
+
+      - uses: taiki-e/install-action@cargo-hack
+
+      - name: Remove dev-dependencies
+        run: cargo hack --remove-dev-deps update
+
+      - name: Pin deps
+        run: cargo update -p itoa --precise 1.0.15
+
       - name: Get MSRV from package metadata
         id: metadata
         run: echo "msrv=$(yq '.package.rust-version' Cargo.toml)" >> $GITHUB_OUTPUT
@@ -85,9 +95,6 @@ jobs:
         with:
           toolchain: ${{ steps.metadata.outputs.msrv }}
 
-      - name: Pin deps
-        run: cargo update -p itoa --precise 1.0.15
-
       - name: Test
         run: cargo check -p http
 

Cargo.toml

@@ -41,7 +41,7 @@ itoa = "1"
 
 [dev-dependencies]
 quickcheck = "1"
-rand = "0.8.0"
+rand = "0.10"
 serde = "1.0"
 serde_json = "1.0"
 doc-comment = "0.3"

tests/header_map_fuzz.rs

@@ -3,8 +3,8 @@ use http::*;
 
 use quickcheck::{Arbitrary, Gen, QuickCheck, TestResult};
 use rand::rngs::StdRng;
-use rand::seq::SliceRandom;
-use rand::{Rng, SeedableRng};
+use rand::seq::IndexedRandom;
+use rand::{RngExt, SeedableRng};
 
 use std::collections::HashMap;
 
@@ -76,12 +76,12 @@ impl Fuzz {
 
         let mut steps = vec![];
         let mut expect = AltMap::default();
-        let num = rng.gen_range(5..500);
+        let num = rng.random_range(5..500);
 
         let weight = Weight {
-            insert: rng.gen_range(1..10),
-            remove: rng.gen_range(1..10),
-            append: rng.gen_range(1..10),
+            insert: rng.random_range(1..10),
+            remove: rng.random_range(1..10),
+            append: rng.random_range(1..10),
         };
 
         while steps.len() < num {
@@ -111,8 +111,8 @@ impl Fuzz {
 }
 
 impl Arbitrary for Fuzz {
-    fn arbitrary(_: &mut Gen) -> Self {
-        Self::new(rand::thread_rng().gen())
+    fn arbitrary(g: &mut Gen) -> Self {
+        Self::new(Arbitrary::arbitrary(g))
     }
 }
 
@@ -130,7 +130,7 @@ impl AltMap {
     fn gen_action(&mut self, weight: &Weight, rng: &mut StdRng) -> Action {
         let sum = weight.insert + weight.remove + weight.append;
 
-        let mut num = rng.gen_range(0..sum);
+        let mut num = rng.random_range(0..sum);
 
         if num < weight.insert {
             return self.gen_insert(rng);
@@ -180,7 +180,7 @@ impl AltMap {
 
     /// Negative numbers weigh finding an existing header higher
     fn gen_name(&self, weight: i32, rng: &mut StdRng) -> HeaderName {
-        let mut existing = rng.gen_ratio(1, weight.abs() as u32);
+        let mut existing = rng.random_ratio(1, weight.abs() as u32);
 
         if weight < 0 {
             existing = !existing;
@@ -202,7 +202,7 @@ impl AltMap {
         if self.map.is_empty() {
             None
         } else {
-            let n = rng.gen_range(0..self.map.len());
+            let n = rng.random_range(0..self.map.len());
             self.map.keys().nth(n).map(Clone::clone)
         }
     }
@@ -337,7 +337,7 @@ fn gen_header_name(g: &mut StdRng) -> HeaderName {
         header::X_XSS_PROTECTION,
     ];
 
-    if g.gen_ratio(1, 2) {
+    if g.random_ratio(1, 2) {
         STANDARD_HEADERS.choose(g).unwrap().clone()
     } else {
         let value = gen_string(g, 1, 25);