🗑️ chore: fix deprecated warnings

Author: Lhcfl

src/assets/idiom.rs

@@ -1,4 +1,4 @@
-use rand::{seq::IteratorRandom, thread_rng};
+use rand::{rng, seq::IteratorRandom};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, sync::LazyLock};
 
@@ -41,7 +41,7 @@ static IDIOM_MAP: LazyLock<HashMap<String, &'static Idiom>> = LazyLock::new(|| {
 });
 
 pub fn random_idiom() -> &'static Idiom {
-    IDIOMS.iter().choose(&mut thread_rng()).unwrap()
+    IDIOMS.iter().choose(&mut rng()).unwrap()
 }
 
 pub fn get_idiom(word: &str) -> Option<&'static Idiom> {

src/assets/tarot.rs

@@ -1,4 +1,4 @@
-use rand::{random, seq::index, thread_rng};
+use rand::{random, seq::index, rng};
 use std::fmt;
 
 pub struct MajorArcana {
@@ -27,7 +27,7 @@ impl fmt::Display for TarotChoosen {
 
 pub fn n_random_majors(n: usize) -> Vec<TarotChoosen> {
     assert!(n <= 22);
-    index::sample(&mut thread_rng(), 21, n)
+    index::sample(&mut rng(), 21, n)
         .into_iter()
         .map(|id| {
             let rev: bool = random();

src/mods/answer_book.rs

@@ -29,7 +29,7 @@ fn on_bad_answer_message(ctx: &mut Context, _message: &Message) -> Consumption {
     let ctx = ctx.task();
     async move {
         let chosen = bad_answer_book::ANSWERS
-            .choose(&mut rand::thread_rng())
+            .choose(&mut rand::rng())
             .expect("not empty");
         let res = ctx.reply(*chosen).send().await;
         if let Err(err) = res {

src/mods/dice.rs

@@ -5,9 +5,9 @@ use rand::Rng;
 use teloxide_core::prelude::*;
 use teloxide_core::types::*;
 
+use crate::Consumption;
 use crate::linquebot::*;
 use crate::utils::telegram::prelude::WarnOnError;
-use crate::Consumption;
 
 pub fn dice(ctx: &mut Context, message: &Message) -> Consumption {
     use crate::utils::pattern::*;
@@ -68,7 +68,7 @@ pub fn dice(ctx: &mut Context, message: &Message) -> Consumption {
 
     async move {
         let results = (0..x)
-            .map(|_| rand::thread_rng().gen_range(1..=y as u64))
+            .map(|_| rand::rng().random_range(1..=y as u64))
             .collect::<Vec<_>>();
 
         // x 个 u32 的和肯定不会超过 u64，可以放心不会 panic

src/mods/greetings.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, time::SystemTime};
 
 use crate::{
-    linquebot::{msg_context::Context, types::Consumption, Module, ModuleDescription, ModuleKind},
+    linquebot::{Module, ModuleDescription, ModuleKind, msg_context::Context, types::Consumption},
     utils::telegram::prelude::WarnOnError,
 };
 use rand::seq::IteratorRandom;
@@ -48,7 +48,7 @@ fn toggle_greeting(ctx: &mut Context, _msg: &Message) -> Consumption {
 
 mod morning {
     use crate::{
-        linquebot::{msg_context::TaskContext, TaskResult},
+        linquebot::{TaskResult, msg_context::TaskContext},
         utils::telegram::prelude::*,
     };
     use teloxide_core::{prelude::*, types::User};
@@ -131,10 +131,9 @@ fn say_greeting(ctx: &mut Context, msg: &Message) -> Consumption {
                         .is_ok_and(|dur| dur.as_secs() > 3600))
                     || force
                 {
-                    tokio::spawn(morning::MORNING
-                        .iter()
-                        .choose(&mut rand::thread_rng())
-                        .unwrap()(ctx, user));
+                    tokio::spawn(morning::MORNING.iter().choose(&mut rand::rng()).unwrap()(
+                        ctx, user,
+                    ));
                 }
             }
             GreetingKind::Night => {

src/mods/rand.rs

@@ -2,18 +2,18 @@
 use log::warn;
 use msg_context::Context;
 use msg_context::TaskContext;
-use rand::seq::SliceRandom;
 use rand::Rng;
+use rand::seq::SliceRandom;
 use teloxide_core::prelude::*;
 use teloxide_core::types::*;
 
+use crate::Consumption;
 use crate::linquebot::*;
 use crate::utils::telegram::prelude::*;
 use crate::utils::*;
-use crate::Consumption;
 
 async fn send_raw_rand(ctx: TaskContext, from: User, text_body: String) {
-    let result = rand::thread_rng().gen_range(0..=100);
+    let result = rand::rng().random_range(0..=100);
     let msg = format!(
         "{} {}",
         from.html_link(),
@@ -35,7 +35,7 @@ async fn send_selective_rand(ctx: TaskContext, text_body: String, spliter: &str)
         .filter(|str| !str.is_empty())
         .collect::<Vec<_>>();
 
-    result.shuffle(&mut rand::thread_rng());
+    result.shuffle(&mut rand::rng());
 
     let result = result.first().unwrap_or(&spliter);
 

src/mods/waife.rs

@@ -7,7 +7,7 @@ use log::info;
 use log::warn;
 use msg_context::Context;
 use rand::seq::SliceRandom;
-use rand::thread_rng;
+use rand::rng;
 use serde::Deserialize;
 use serde::Serialize;
 use std::cmp::min;
@@ -299,7 +299,7 @@ fn get_waife(ctx: &mut Context, msg: &Message) -> Consumption {
                 .await;
         }
 
-        available_waifes.shuffle(&mut thread_rng());
+        available_waifes.shuffle(&mut rng());
 
         let mut waife_names = String::new();