feat: avoid creating SmallRng when only one number is required

Author: andrew-james-dev

frameworks/Rust/axum/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "axum-techempower"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Dragos Varovici <[email protected]>"]
 edition = "2024"
 

frameworks/Rust/axum/Cargo.toml

@@ -40,5 +40,4 @@ built with Tokio, Tower, and Hyper.
 - Use of PostgreSQL prepared statements cache (where supported).
 - Use of PostgreSQL arrays to execute multi-row database updates with a single `UPDATE` query.
   - This is permitted by the [test requirements](https://github.com/TechEmpower/FrameworkBenchmarks/wiki/Project-Information-Framework-Tests-Overview#database-updates), step (ix).
-- More performance improvements are to be expected in version 0.8:
-  - https://github.com/tokio-rs/axum/issues/1827
+- Use of a fast PRNG

frameworks/Rust/axum/README.md

@@ -1,7 +1,7 @@
 use std::{env, str::FromStr};
 
 use core::fmt::Debug;
-use rand::{distr::Uniform, rngs::SmallRng, Rng};
+use rand::{distr::Uniform, rngs::SmallRng, Rng, RngCore};
 pub mod models;
 pub mod utils;
 
@@ -36,7 +36,7 @@ where
 /// Generate a single integer in the range 1 to 10,000 (inclusive)
 #[allow(dead_code)]
 #[inline(always)]
-pub fn random_id(rng: &mut SmallRng) -> i32 {
+pub fn random_id(rng: &mut impl RngCore) -> i32 {
     rng.random_range(1..=10_000)
 }
 

frameworks/Rust/axum/src/common/mod.rs

@@ -21,7 +21,7 @@ use mongodb::{
     options::{ClientOptions, Compressor},
     Client,
 };
-use rand::{rngs::SmallRng, rng, Rng, SeedableRng};
+use rand::{rngs::SmallRng, rng, SeedableRng};
 use yarte::Template;
 use mimalloc::MiMalloc;
 
@@ -43,9 +43,7 @@ pub struct FortunesTemplate<'a> {
 }
 
 async fn db(DatabaseConnection(db): DatabaseConnection) -> impl IntoResponse {
-    let mut rng = SmallRng::from_rng(&mut rng());
-
-    let random_id = rng.random_range(1..=10_000) as i32;
+    let random_id = random_id(&mut rng());
 
     let world = find_world_by_id(db, random_id)
         .await

frameworks/Rust/axum/src/main_mongo.rs

@@ -35,9 +35,7 @@ use mongodb::{
 use rand::{rngs::SmallRng, rng, SeedableRng};
 
 async fn db(DatabaseConnection(db): DatabaseConnection) -> impl IntoResponse {
-    let mut rng = SmallRng::from_rng(&mut rng());
-
-    let random_id = random_id(&mut rng);
+    let random_id = random_id(&mut rng());
 
     let world = find_world_by_id(db, random_id)
         .await

frameworks/Rust/axum/src/main_mongo_raw.rs

@@ -5,7 +5,7 @@ use axum::{
     extract::Query, http::StatusCode, response::IntoResponse, routing::get, Router,
 };
 use dotenv::dotenv;
-use rand::{rngs::SmallRng, rng, SeedableRng};
+use rand::rng;
 use yarte::Template;
 use mimalloc::MiMalloc;
 
@@ -33,10 +33,9 @@ pub struct FortunesTemplate<'a> {
 }
 
 async fn db(DatabaseConnection(conn): DatabaseConnection) -> impl IntoResponse {
-    let mut rng = SmallRng::from_rng(&mut rng());
-
+    let id = random_id(&mut rng());
     let world = conn
-        .fetch_world_by_id(random_id(&mut rng))
+        .fetch_world_by_id(id)
         .await
         .expect("error loading world");
 

frameworks/Rust/axum/src/main_pg.rs

@@ -38,8 +38,7 @@ pub struct FortunesTemplate<'a> {
 }
 
 async fn db(DatabaseClient(client): DatabaseClient) -> impl IntoResponse {
-    let mut rng = SmallRng::from_rng(&mut rng());
-    let random_id = random_id(&mut rng);
+    let random_id = random_id(&mut rng());
 
     let select = &client.prepare_cached(SELECT_WORLD_BY_ID).await.unwrap();
     let world = fetch_world_by_id(&client, random_id, select)

frameworks/Rust/axum/src/main_pg_pool.rs

@@ -42,10 +42,9 @@ pub struct FortunesTemplate<'a> {
 }
 
 async fn db(State(AppState { db, .. }): State<AppState>) -> impl IntoResponse {
-    let mut rng = SmallRng::from_rng(&mut rng());
-
+    let id = random_id(&mut rng());
     let world: World = ::sqlx::query_as(common::SELECT_WORLD_BY_ID)
-        .bind(random_id(&mut rng))
+        .bind(id)
         .fetch_one(&mut *db.acquire().await.unwrap())
         .await
         .expect("error loading world");

frameworks/Rust/axum/src/main_sqlx.rs

@@ -37,7 +37,7 @@ fn set_socket_options(addr: SocketAddr) -> io::Result<tokio::net::TcpListener> {
 }
 
 /// Build an Axum server with consistent configuration, using the high-level API exposed
-/// by Axum 0.7. This is intended for convenience and intentionally does not provide much
+/// by Axum 0.8. This is intended for convenience and intentionally does not provide much
 /// customisability.
 #[allow(dead_code)]
 pub async fn serve(app: Router<()>, port: Option<u16>) {