refactor: upgrade to Rust 2024, v1.85 (#92)

Author: sheroz

.github/workflows/ci.yml

@@ -15,13 +15,15 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: EmbarkStudios/cargo-deny-action@v2
+      with:
+        rust-version: "1.85"
 
   cargo-fmt-clippy:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Print the Rust version
-      run: rustc --version
+    - name: Update the Rust toolchain to the latest stable version
+      run: rustup default 1.85 && rustup component add rustfmt && rustup component add clippy && rustc --version
     - name: Cargo formatting check
       run: cargo fmt --all -- --check
     - name: Cargo clippy check
@@ -33,12 +35,16 @@ jobs:
     - uses: actions/checkout@v4
     - name: Build and run the docker services
       run: docker compose up -d
+    - name: Update the Rust toolchain to the latest stable version
+      run: rustup default 1.85 && rustc --version
     - name: Run tests
       run: cargo test --verbose
 
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - name: Update the Rust toolchain to the latest stable version
+      run: rustup default 1.85 && rustc --version
     - name: Build
       run: cargo build --verbose

CHANGELOG.md

@@ -2,16 +2,21 @@
 
 All notable changes to this project will be documented in this file.
 
+## 0.1.3 (2025-02-20)
+
+* refactor: upgrade to Rust v1.85, edition 2024
+* refactor: error handling
+* docs: updated readme, changelog and API documentation  
+
 ## 0.1.2 (2025-01-29)
 
-* Added transaction samples.
-* Added structured error response.
-* Refactored and updated dependencies.  
+* feat: transaction samples.
+* feat: structured error response.
 
 ## 0.1.1 (2025-01-04)
 
-* Updated dependencies and fixed breaking changes.
+* fix: breaking changes after upgrading to axum 0.8
 
 ## 0.1.0 (2023-11-09)
 
-* Project started.
+* project started.

Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "axum-web"
 version = "0.1.3"
-edition = "2021"
+edition = "2024"
 authors = ["Sheroz Khaydarov"]
 description = "A sample starter project for building REST API Web service in Rust using axum, JWT, SQLx, PostgreSQL, and Redis"
 readme = "README.md"
 repository = "https://github.com/sheroz/axum-web"
 license = "MIT"
-rust-version = "1.84"
+rust-version = "1.85"
 
 [dependencies]
 dotenvy = "0.15"

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.84 as builder
+FROM rust:1.85 as builder
 WORKDIR /opt
 COPY . .
 RUN cargo build --release

clippy.toml

@@ -1,4 +1,4 @@
-msrv = "1.84"
+msrv = "1.85"
 
 disallowed-types = [
     { path = "std::collections::LinkedList", reason = "LinkedList as a slow and almost never needed" },

src/api/error.rs

@@ -1,9 +1,9 @@
 use std::fmt::{Display, Formatter, Result};
 
 use axum::{
+    Json,
     http::StatusCode,
     response::{IntoResponse, Response},
-    Json,
 };
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};

src/api/extractors.rs

@@ -1,21 +1,21 @@
 use std::sync::Arc;
 
 use axum::{
+    RequestPartsExt,
     extract::{FromRef, FromRequestParts},
     http::request::Parts,
-    RequestPartsExt,
 };
 use axum_extra::{
-    headers::{authorization::Bearer, Authorization},
     TypedHeader,
+    headers::{Authorization, authorization::Bearer},
 };
 
 use crate::{
     api::APIError,
     application::{
         security::{
             auth::{self, AuthError},
-            jwt::{decode_token, AccessClaims, ClaimsMethods, RefreshClaims},
+            jwt::{AccessClaims, ClaimsMethods, RefreshClaims, decode_token},
         },
         state::SharedState,
     },

src/api/handlers/account_handlers.rs

@@ -1,15 +1,15 @@
 use axum::{
+    Json,
     extract::{Path, State},
     http::StatusCode,
     response::IntoResponse,
-    Json,
 };
 use sqlx::types::Uuid;
 
 use crate::{
     api::{
-        version::{self, APIVersion},
         APIError,
+        version::{self, APIVersion},
     },
     application::{
         repository::account_repo,

src/api/handlers/auth_handlers.rs

@@ -1,10 +1,10 @@
-use axum::{extract::State, http::StatusCode, response::IntoResponse, Json};
+use axum::{Json, extract::State, http::StatusCode, response::IntoResponse};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use sqlx::types::Uuid;
 
 use crate::{
-    api::{version::APIVersion, APIError, APIErrorCode, APIErrorEntry, APIErrorKind},
+    api::{APIError, APIErrorCode, APIErrorEntry, APIErrorKind, version::APIVersion},
     application::{
         repository::user_repo,
         security::{

src/api/handlers/transaction_handlers.rs

@@ -1,16 +1,16 @@
 use axum::{
+    Json,
     extract::{Path, State},
     http::StatusCode,
-    Json,
 };
 use serde::{Deserialize, Serialize};
 use sqlx::types::Uuid;
 use thiserror::Error;
 
 use crate::{
     api::{
-        version::{self, APIVersion},
         APIError, APIErrorCode, APIErrorEntry, APIErrorKind,
+        version::{self, APIVersion},
     },
     application::{
         repository::transaction_repo,