From fe3156587c058299fb5de38e296046192d91d984 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Thu, 3 Jul 2025 09:52:53 +0200 Subject: [PATCH] Bump rand to v0.9 (#811) --- Cargo.toml | 2 +- examples/Cargo.toml | 2 +- tower/examples/tower-balance.rs | 3 +-- tower/tests/balance/main.rs | 9 ++++----- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e1a94d2b..688c1871 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ http = "1" indexmap = "2.0.2" pin-project-lite = "0.2.7" quickcheck = "1" -rand = "0.8" +rand = "0.9" slab = "0.4.9" sync_wrapper = "1" tokio = "1.6.2" diff --git a/examples/Cargo.toml b/examples/Cargo.toml index b8faa462..e9fcf1e4 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" tower = { version = "0.4", path = "../tower", features = ["full"] } tower-service = "0.3" tokio = { version = "1.0", features = ["full"] } -rand = "0.8" +rand = "0.9" pin-project = "1.0" futures = "0.3.22" tracing = "0.1" diff --git a/tower/examples/tower-balance.rs b/tower/examples/tower-balance.rs index 851f3ec2..f220a909 100644 --- a/tower/examples/tower-balance.rs +++ b/tower/examples/tower-balance.rs @@ -4,7 +4,6 @@ use futures_core::{Stream, TryStream}; use futures_util::{stream, stream::StreamExt, stream::TryStreamExt}; use hdrhistogram::Histogram; use pin_project_lite::pin_project; -use rand::{self, Rng}; use std::hash::Hash; use std::time::Duration; use std::{ @@ -124,7 +123,7 @@ fn gen_disco() -> impl Discover< let maxms = u64::from(latency.subsec_millis()) .saturating_add(latency.as_secs().saturating_mul(1_000)); - let latency = Duration::from_millis(rand::thread_rng().gen_range(0..maxms)); + let latency = Duration::from_millis(rand::random_range(0..maxms)); async move { time::sleep_until(start + latency).await; diff --git a/tower/tests/balance/main.rs b/tower/tests/balance/main.rs index ff19eab1..9675e3f1 100644 --- a/tower/tests/balance/main.rs +++ b/tower/tests/balance/main.rs @@ -28,7 +28,7 @@ impl Service for Mock { impl tower::load::Load for Mock { type Metric = usize; fn load(&self) -> Self::Metric { - rand::random() + rand::random_range(usize::MIN..=usize::MAX) } } @@ -43,7 +43,7 @@ fn stress() { let mut services = slab::Slab::<(mock::Handle, bool)>::new(); let mut retired = Vec::>::new(); for _ in 0..100_000 { - for _ in 0..(rand::random::() % 8) { + for _ in 0..rand::random_range(0u8..8) { if !services.is_empty() && rand::random() { if nready == 0 || rand::random::() > u8::MAX / 4 { // ready a service @@ -114,8 +114,7 @@ fn stress() { } else { // remove while !services.is_empty() { - let k = - rand::random::() % (services.iter().next_back().unwrap().0 + 1); + let k = rand::random_range(0..=services.iter().next_back().unwrap().0); if services.contains(k) { let (handle, ready) = services.remove(k); if ready { @@ -130,7 +129,7 @@ fn stress() { } else { // fail a service while !services.is_empty() { - let k = rand::random::() % (services.iter().next_back().unwrap().0 + 1); + let k = rand::random_range(0..=services.iter().next_back().unwrap().0); if services.contains(k) { let (mut handle, ready) = services.remove(k); if ready {