From 58047f90f79b129e445cbf856a23b3a5518c0b12 Mon Sep 17 00:00:00 2001
From: KunoiSayami <i@leanhe.dev>
Date: Tue, 4 Mar 2025 22:48:32 +0800
Subject: chore: Update to rust-2024 version

Signed-off-by: KunoiSayami <i@leanhe.dev>
---
 src/datastructures.rs | 10 +++++-----
 src/main.rs           |  4 ++--
 src/test.rs           | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/datastructures.rs b/src/datastructures.rs
index ef5c8a4..1894d33 100644
--- a/src/datastructures.rs
+++ b/src/datastructures.rs
@@ -17,8 +17,8 @@
 
 use anyhow::Result;
 use argon2::{
-    password_hash::{rand_core::OsRng, PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
     Argon2,
+    password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString, rand_core::OsRng},
 };
 use base64::Engine;
 #[cfg(feature = "pam")]
@@ -53,19 +53,19 @@ pub fn get_current_timestamp() -> u64 {
 }
 
 pub fn rand_int() -> RandIntType {
-    let mut rng = rand::thread_rng();
-    rng.gen()
+    let mut rng = rand::rng();
+    rng.random()
 }
 
 pub fn rand_str(len: usize) -> String {
     const CHARSET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ\
                         abcdefghijklmnopqrstuvwxyz\
                         0123456789";
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
     let password: String = (0..len)
         .map(|_| {
-            let idx = rng.gen_range(0..CHARSET.len());
+            let idx = rng.random_range(0..CHARSET.len());
             CHARSET[idx] as char
         })
         .collect();
diff --git a/src/main.rs b/src/main.rs
index 5b10e01..268cbe5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -168,7 +168,7 @@ async fn cmd_authenticate_cookie(matches: &ArgMatches, cfg: Config) -> Result<bo
                 .await?
         {
             let users = users.split_whitespace().collect::<Vec<&str>>();
-            conn.sadd(&redis_key, users).await?;
+            let _: () = conn.sadd(&redis_key, users).await?;
         }
     }
 
@@ -841,7 +841,7 @@ fn main() -> Result<()> {
             return Err(anyhow::Error::msg(format!(
                 "Got error while append to {}: {:?}",
                 &logfile_path, e
-            )))
+            )));
         }
     };
 
diff --git a/src/test.rs b/src/test.rs
index 45900d1..54435e5 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -18,13 +18,13 @@
 #[cfg(test)]
 mod core {
     use crate::{
-        cmd_add_user, cmd_authenticate_cookie, cmd_init, cmd_repo_user_control,
-        datastructures::{rand_str, Config, TestSuite},
-        get_arg_matches, IOModule,
+        IOModule, cmd_add_user, cmd_authenticate_cookie, cmd_init, cmd_repo_user_control,
+        datastructures::{Config, TestSuite, rand_str},
+        get_arg_matches,
     };
     use argon2::{
-        password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
         Argon2,
+        password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
     };
     use redis::AsyncCommands;
     #[cfg(feature = "pam")]
@@ -37,7 +37,7 @@ mod core {
 
     #[test]
     fn test_argon2() {
-        use rand_core::OsRng;
+        use argon2::password_hash::rand_core::OsRng;
         let passwd = b"hunter2";
         let salt = SaltString::generate(&mut OsRng);
 
@@ -65,7 +65,7 @@ mod core {
 
         assert_eq!(conn.get::<_, String>("auth_test").await?, s);
 
-        conn.del("auth_test").await?;
+        let _: () = conn.del("auth_test").await?;
 
         assert_eq!(conn.exists::<_, bool>("auth_test").await?, false);
         Ok(())
-- 
cgit v1.3.1