From 6966d32bace7e34e0d80966710784d25154f7d0d Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Mon, 27 Jan 2025 13:33:53 -0500 Subject: [PATCH] Dependency updates, lint fix --- Cargo.toml | 2 +- README.md | 2 +- src/base62/mod.rs | 4 ++-- src/gf256/mod.rs | 2 +- src/lib.rs | 5 ++--- src/shamir/mod.rs | 8 ++++---- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 87eb311..8d5536c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ getset = "0.1.4" num-bigint = "0.4.6" num-traits = "0.2.19" num-integer = "0.1.46" -rand = "0.8.5" +rand = "0.9.0" serde = { version = "1.0.217", features = ["derive"] } thiserror = "2.0.11" diff --git a/README.md b/README.md index b126bc8..ead7a34 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ assert_eq!(unlock(&shares)?, secret); // Remove a random share from `shares` and check that 4 shares can unlock // the secret -let mut rng = thread_rng(); +let mut rng = rng(); remove_random_entry(&mut rng, &mut shares); assert_eq!(shares.len(), 4); assert_eq!(unlock(&shares)?, secret); diff --git a/src/base62/mod.rs b/src/base62/mod.rs index 302df0f..0b498cf 100644 --- a/src/base62/mod.rs +++ b/src/base62/mod.rs @@ -10,7 +10,7 @@ use anyhow::Result; use num_bigint::BigUint; use num_integer::Integer; use num_traits::{One, ToPrimitive, Zero}; -use rand::{thread_rng, RngCore}; +use rand::{rng, RngCore}; use crate::error::SsssError::BadCharacter; @@ -28,7 +28,7 @@ pub(crate) fn encode(bytes: &[u8]) -> String { String::new() } else { let mut nonce = [0u8; 10]; - thread_rng().fill_bytes(&mut nonce); + rng().fill_bytes(&mut nonce); let mut input = nonce.to_vec(); input[0] = 1; input.extend_from_slice(bytes); diff --git a/src/gf256/mod.rs b/src/gf256/mod.rs index 216da31..add2b32 100644 --- a/src/gf256/mod.rs +++ b/src/gf256/mod.rs @@ -14,7 +14,7 @@ use constants::{EXP, LOG}; use rand::RngCore; pub(crate) fn generate_coeffs(d: u8, x: u8) -> Vec { - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); let d_usize = usize::from(d); let mut rand_bytes = vec![0; d_usize]; diff --git a/src/lib.rs b/src/lib.rs index 694d6a2..430131c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,7 +32,7 @@ //! //! ```rust //! # use anyhow::Result; -//! # use rand::{thread_rng, rngs::ThreadRng}; +//! # use rand::{rng, rngs::ThreadRng}; //! # use ssss::{unlock, gen_shares, remove_random_entry, SsssConfig}; //! # //! # fn main() -> Result<()> { @@ -49,7 +49,7 @@ //! //! // Remove a random share from `shares` and check that 4 shares can unlock //! // the secret -//! let mut rng = thread_rng(); +//! let mut rng = rng(); //! remove_random_entry(&mut rng, &mut shares); //! assert_eq!(shares.len(), 4); //! assert_eq!(unlock(&shares)?, secret); @@ -229,7 +229,6 @@ unused_variables, useless_ptr_null_checks, variant_size_differences, - wasm_c_abi, while_true, ) )] diff --git a/src/shamir/mod.rs b/src/shamir/mod.rs index ebc87f7..b3cf7df 100644 --- a/src/shamir/mod.rs +++ b/src/shamir/mod.rs @@ -155,7 +155,7 @@ fn validate_split_args(config: &SsssConfig, secret: &[u8]) -> Result<()> { /// # Example /// ``` /// # use anyhow::Result; -/// # use rand::{thread_rng, rngs::ThreadRng}; +/// # use rand::{rng, rngs::ThreadRng}; /// # use ssss::{gen_shares, unlock, remove_random_entry, SsssConfig}; /// # /// # pub fn main() -> Result<()> { @@ -173,7 +173,7 @@ fn validate_split_args(config: &SsssConfig, secret: &[u8]) -> Result<()> { /// /// // Remove a random share from `shares` and check that 4 shares can unlock /// // the secret -/// let mut rng = thread_rng(); +/// let mut rng = rng(); /// remove_random_entry(&mut rng, &mut shares); /// assert_eq!(shares.len(), 4); /// assert_eq!(unlock(&shares)?, secret); @@ -237,7 +237,7 @@ mod test { use super::{gen_shares, unlock, utils::encode_share, SsssConfig}; use crate::utils::{check_err_result, remove_random_entry}; use anyhow::Result; - use rand::thread_rng; + use rand::rng; #[test] fn empty_secret() -> Result<()> { @@ -333,7 +333,7 @@ mod test { assert_eq!(unlock(&parts)?, secret); // 4 parts shoud work - let mut rng = thread_rng(); + let mut rng = rng(); remove_random_entry(&mut rng, &mut parts); assert_eq!(parts.len(), 4); assert_eq!(unlock(&parts)?, secret);