Require rustc 1.85 and make required changes

Author: matze

.github/workflows/release.yml

@@ -17,5 +17,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
+          TOOLCHAIN_VERSION: 1.85.0
           RUSTTARGET: ${{ matrix.target }}
           EXTRA_FILES: "README.md LICENSE"

Cargo.lock

@@ -1,8 +1,8 @@
 [package]
 name = "wastebin"
 version = "2.7.1"
-edition = "2021"
-rust-version = "1.83"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
 askama = { version = "0.12", default-features = false, features = ["with-axum"] }
@@ -19,7 +19,7 @@ http = "1.1.0"
 mime = "0.3"
 qrcodegen = "1"
 parking_lot = "0.12.1"
-rand = "0.8"
+rand = "0.9"
 rusqlite = { version = "0.32", features = ["bundled"] }
 rusqlite_migration = { version = "1", default-features = false }
 rust-argon2 = "2.0.0"

Cargo.toml

@@ -1,6 +1,6 @@
 # --- build image
 
-FROM rust:1.84 AS builder
+FROM rust:1.85 AS builder
 
 RUN rustup target add x86_64-unknown-linux-musl
 RUN apt update && apt install -y musl-tools musl-dev

Dockerfile

@@ -1,5 +1,5 @@
 # --- build image
-FROM rust:1.83 AS builder
+FROM rust:1.85 AS builder
 
 RUN rustup target add aarch64-unknown-linux-musl && \
     apt-get update && \

Dockerfile.arm

@@ -1,8 +1,8 @@
-use crate::db::{write, Database};
+use crate::db::{Database, write};
 use crate::errors::{Error, JsonErrorResponse};
 use crate::id::Id;
-use axum::extract::State;
 use axum::Json;
+use axum::extract::State;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 use std::num::NonZeroU32;
@@ -40,13 +40,10 @@ pub async fn post(
     State(db): State<Database>,
     Json(entry): Json<Entry>,
 ) -> Result<Json<RedirectResponse>, JsonErrorResponse> {
-    let id: Id = tokio::task::spawn_blocking(|| {
-        let mut rng = rand::thread_rng();
-        rng.gen::<u32>()
-    })
-    .await
-    .map_err(Error::from)?
-    .into();
+    let id: Id = tokio::task::spawn_blocking(|| rand::rng().random::<u32>())
+        .await
+        .map_err(Error::from)?
+        .into();
 
     let entry: write::Entry = entry.into();
     let path = format!("/{}", id.to_url_path(&entry));

src/handlers/insert/api.rs

@@ -1,4 +1,4 @@
-use crate::db::{write, Database};
+use crate::db::{Database, write};
 use crate::handlers::extract::Theme;
 use crate::handlers::html::make_error;
 use crate::id::Id;
@@ -65,13 +65,10 @@ pub async fn post(
         .unwrap_or(false);
 
     async {
-        let id: Id = tokio::task::spawn_blocking(|| {
-            let mut rng = rand::thread_rng();
-            rng.gen::<u32>()
-        })
-        .await
-        .map_err(Error::from)?
-        .into();
+        let id: Id = tokio::task::spawn_blocking(|| rand::rng().random::<u32>())
+            .await
+            .map_err(Error::from)?
+            .into();
 
         // Retrieve uid from cookie or generate a new one.
         let uid = if let Some(cookie) = jar.get("uid") {
@@ -110,7 +107,7 @@ pub async fn post(
 #[cfg(test)]
 mod tests {
     use crate::test_helpers::Client;
-    use reqwest::{header, StatusCode};
+    use reqwest::{StatusCode, header};
     use std::collections::HashMap;
 
     #[tokio::test]