From b50bd43a258110a47068f3e76572640c0a7b0051 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Mon, 27 Jan 2025 14:58:15 +0100 Subject: [PATCH] build(deps): upgrade `rand` to v0.9 --- Cargo.lock | 103 +++++++++++++++++++++++++++++++---- watermelon/Cargo.toml | 2 +- watermelon/src/client/mod.rs | 3 +- 3 files changed, 94 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aa3d348..ec85756 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -405,7 +405,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71393ecc86efbf00e4ca13953979ba8b94cfe549a4b74cc26d8b62f4d8feac2b" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets 0.52.6", ] [[package]] @@ -738,7 +750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -824,7 +836,7 @@ version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -862,8 +874,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.0", + "zerocopy 0.8.14", ] [[package]] @@ -873,7 +896,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.6.4", +] + +[[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.0", ] [[package]] @@ -882,7 +915,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", +] + +[[package]] +name = "rand_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b08f3c9802962f7e1b25113931d94f43ed9725bebc59db9d0c3e9a23b67e15ff" +dependencies = [ + "getrandom 0.3.0", + "zerocopy 0.8.14", ] [[package]] @@ -922,7 +965,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -1286,7 +1329,7 @@ dependencies = [ "futures-sink", "http", "httparse", - "rand", + "rand 0.8.5", "ring", "tokio", "tokio-rustls", @@ -1351,6 +1394,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -1422,7 +1474,7 @@ dependencies = [ "futures-util", "pin-project-lite", "portable-atomic", - "rand", + "rand 0.9.0", "serde", "serde_json", "thiserror 2.0.11", @@ -1679,6 +1731,15 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags", +] + [[package]] name = "write16" version = "1.0.0" @@ -1722,7 +1783,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" +dependencies = [ + "zerocopy-derive 0.8.14", ] [[package]] @@ -1736,6 +1806,17 @@ dependencies = [ "syn", ] +[[package]] +name = "zerocopy-derive" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zerofrom" version = "0.1.5" diff --git a/watermelon/Cargo.toml b/watermelon/Cargo.toml index 3b7af43..4550baa 100644 --- a/watermelon/Cargo.toml +++ b/watermelon/Cargo.toml @@ -20,7 +20,7 @@ bytes = "1" serde = { version = "1.0.113", features = ["derive"] } serde_json = "1" pin-project-lite = "0.2" -rand = "0.8" +rand = { version = "0.9", default-features = false, features = ["thread_rng"] } chrono = { version = "0.4.20", default-features = false, features = ["std", "clock", "serde"] } # from-env diff --git a/watermelon/src/client/mod.rs b/watermelon/src/client/mod.rs index d38fd56..11cfc27 100644 --- a/watermelon/src/client/mod.rs +++ b/watermelon/src/client/mod.rs @@ -7,7 +7,6 @@ use std::{ use arc_swap::ArcSwap; use bytes::Bytes; -use rand::RngCore; use tokio::{ sync::{ mpsc::{self, error::TrySendError, Permit}, @@ -497,7 +496,7 @@ impl TryCommandError { pub(crate) fn create_inbox_subject(prefix: &Subject) -> Subject { let mut suffix = [0u8; 16]; - rand::thread_rng().fill_bytes(&mut suffix); + rand::fill(&mut suffix); let mut subject = String::with_capacity(prefix.len() + ".".len() + (suffix.len() * 2)); write!(&mut subject, "{}.{:x}", prefix, u128::from_ne_bytes(suffix)).unwrap();