From 4d70864f619559973f9da44094f03dd5fccf7418 Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Fri, 9 May 2025 15:57:04 +0200 Subject: [PATCH] build: upgrade rand to 0.9 --- Cargo.lock | 74 +++++++++++++++++++++++++++++++++++++-------- Cargo.toml | 2 +- src/utils/opaque.rs | 8 ++--- 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7734b960..89371e19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -446,7 +446,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", ] [[package]] @@ -602,7 +614,7 @@ dependencies = [ "parking_lot", "pin-project", "png", - "rand", + "rand 0.9.1", "regex", "repc", "rustc-demangle", @@ -735,7 +747,7 @@ checksum = "8c2ff8ffc19e54477db9489846e5f033fc81d46518683141d887b4c77731b329" dependencies = [ "cfg-if", "linearize-derive", - "rand", + "rand 0.8.5", "version_check", ] @@ -893,7 +905,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared", - "rand", + "rand 0.8.5", ] [[package]] @@ -1002,25 +1014,39 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + [[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +dependencies = [ "rand_chacha", - "rand_core", + "rand_core 0.9.3", ] [[package]] name = "rand_chacha" -version = "0.3.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.9.3", ] [[package]] @@ -1028,8 +1054,14 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom", + "getrandom 0.3.3", ] [[package]] @@ -1047,7 +1079,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror", ] @@ -1516,6 +1548,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.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -1665,6 +1706,15 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags 2.8.0", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/Cargo.toml b/Cargo.toml index 1e6f214f..254e0146 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ libloading = "0.8.1" bstr = { version = "1.9.0", default-features = false, features = ["std"] } isnt = "0.1.0" once_cell = "1.19.0" -rand = "0.8.5" +rand = "0.9.1" smallvec = { version = "1.11.1", features = ["const_generics", "const_new", "union"] } byteorder = "1.5.0" bincode = "1.3.3" diff --git a/src/utils/opaque.rs b/src/utils/opaque.rs index ac6094b5..646c771c 100644 --- a/src/utils/opaque.rs +++ b/src/utils/opaque.rs @@ -1,6 +1,6 @@ use { arrayvec::ArrayString, - rand::{Rng, thread_rng}, + rand::{Rng, rng}, serde::{Deserialize, Deserializer, Serialize, Serializer, de}, std::{ fmt::{Debug, Display, Formatter}, @@ -17,10 +17,10 @@ pub struct Opaque { } pub fn opaque() -> Opaque { - let mut rng = thread_rng(); + let mut rng = rng(); Opaque { - lo: rng.r#gen(), - hi: rng.r#gen(), + lo: rng.random(), + hi: rng.random(), } }