rand: Adjust to breaking API changes

Author: Turbo87

crates/crates_io_test_db/src/lib.rs

@@ -216,9 +216,9 @@ fn run_migrations(conn: &mut PgConnection) -> diesel::migration::Result<()> {
 }
 
 fn generate_name() -> String {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     std::iter::repeat(())
-        .map(|_| rng.sample(rand::distributions::Alphanumeric) as char)
+        .map(|_| rng.sample(rand::distr::Alphanumeric) as char)
         .take(16)
         .collect()
 }

src/bin/crates-admin/populate.rs

@@ -3,8 +3,7 @@ use crates_io::{db, schema::version_downloads};
 use diesel::prelude::*;
 use diesel_async::scoped_futures::ScopedFutureExt;
 use diesel_async::{AsyncConnection, AsyncPgConnection, RunQueryDsl};
-use rand::rngs::StdRng;
-use rand::{Rng, SeedableRng};
+use rand::Rng;
 
 #[derive(clap::Parser, Debug)]
 #[command(
@@ -27,11 +26,10 @@ async fn update(opts: Opts, conn: &mut AsyncPgConnection) -> QueryResult<()> {
     use diesel::dsl::*;
 
     for id in opts.version_ids {
-        let mut rng = StdRng::from_entropy();
-        let mut dls = rng.gen_range(5_000i32..10_000);
+        let mut dls = rand::rng().random_range(5_000i32..10_000);
 
         for day in 0..90 {
-            dls += rng.gen_range(-100..100);
+            dls += rand::rng().random_range(-100..100);
 
             diesel::insert_into(version_downloads::table)
                 .values((

src/email.rs

@@ -8,7 +8,7 @@ use lettre::transport::smtp::authentication::{Credentials, Mechanism};
 use lettre::transport::smtp::AsyncSmtpTransport;
 use lettre::transport::stub::AsyncStubTransport;
 use lettre::{Address, AsyncTransport, Message, Tokio1Executor};
-use rand::distributions::{Alphanumeric, DistString};
+use rand::distr::{Alphanumeric, SampleString};
 use std::sync::Arc;
 
 pub trait Email {
@@ -99,7 +99,7 @@ impl Emails {
         // replace it when it relays the message.
         let message_id = format!(
             "<{}@{}>",
-            Alphanumeric.sample_string(&mut rand::thread_rng(), 32),
+            Alphanumeric.sample_string(&mut rand::rng(), 32),
             self.domain,
         );
 

src/util/token.rs

@@ -1,5 +1,5 @@
 use diesel::{deserialize::FromSql, pg::Pg, serialize::ToSql, sql_types::Bytea};
-use rand::{distributions::Uniform, rngs::OsRng, Rng};
+use rand::distr::{Alphanumeric, SampleString};
 use secrecy::{ExposeSecret, SecretSlice, SecretString};
 use sha2::{Digest, Sha256};
 
@@ -84,13 +84,7 @@ impl ExposeSecret<str> for PlainToken {
 }
 
 fn generate_secure_alphanumeric_string(len: usize) -> String {
-    const CHARS: &[u8] = b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
-    OsRng
-        .sample_iter(Uniform::from(0..CHARS.len()))
-        .map(|idx| CHARS[idx] as char)
-        .take(len)
-        .collect()
+    Alphanumeric.sample_string(&mut rand::rng(), len)
 }
 
 #[cfg(test)]