Bump Rust to 1.86 (#220)

Signed-off-by: Sergio Castaño Arteaga <[email protected]>

Author: tegioz

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.85.0
+          toolchain: 1.86.0
           components: clippy, rustfmt
       - name: Install Tailwind CSS
         run: |

Cargo.toml

@@ -8,7 +8,7 @@ members = [
 version = "0.0.1"
 license = "Apache-2.0"
 edition = "2024"
-rust-version = "1.85"
+rust-version = "1.86"
 
 [workspace.dependencies]
 anyhow = "1.0.97"

gitjobs-server/src/db/img.rs

@@ -1,5 +1,7 @@
 //! This module defines some database functionality used to manage images.
 
+use std::sync::Arc;
+
 use anyhow::Result;
 use async_trait::async_trait;
 use tracing::{instrument, trace};
@@ -24,6 +26,9 @@ pub(crate) trait DBImage {
     async fn save_image_versions(&self, user_id: &Uuid, versions: Vec<ImageVersion>) -> Result<Uuid>;
 }
 
+/// Type alias to represent a `DBImage` trait object.
+pub(crate) type DynDBImage = Arc<dyn DBImage + Send + Sync>;
+
 #[async_trait]
 impl DBImage for PgDB {
     #[instrument(skip(self), err)]

gitjobs-server/src/handlers/auth.rs

@@ -461,7 +461,7 @@ fn get_log_in_url(next_url: Option<&String>) -> String {
     let mut log_in_url = LOG_IN_URL.to_string();
     if let Some(next_url) = next_url {
         log_in_url = format!("{log_in_url}?next_url={next_url}");
-    };
+    }
     log_in_url
 }
 

gitjobs-server/src/img/db.rs

@@ -5,20 +5,18 @@ use async_trait::async_trait;
 use uuid::Uuid;
 
 use crate::{
-    db::DynDB,
+    db::img::DynDBImage,
     img::{ImageFormat, ImageStore, ImageVersion, generate_versions, is_svg},
 };
 
 /// Database-backed image store.
 pub(crate) struct DbImageStore {
-    // TODO: switch to DynDBImage when 1.86 is released
-    // https://github.com/rust-lang/rust/issues/65991
-    db: DynDB,
+    db: DynDBImage,
 }
 
 impl DbImageStore {
     /// Create a new `DbImageStore` instance.
-    pub(crate) fn new(db: DynDB) -> Self {
+    pub(crate) fn new(db: DynDBImage) -> Self {
         Self { db }
     }
 }

gitjobs-server/src/img/mod.rs

@@ -64,7 +64,7 @@ pub(crate) enum ImageFormat {
 
 /// Check if the image is in SVG format.
 pub(crate) fn is_svg(file_name: &str) -> bool {
-    if let Some(extension) = file_name.split('.').last() {
+    if let Some(extension) = file_name.split('.').next_back() {
         if extension.to_lowercase() == "svg" {
             return true;
         }

gitjobs-server/src/main.rs

@@ -58,7 +58,7 @@ async fn main() -> Result<()> {
     match cfg.log.format {
         LogFormat::Json => ts.json().init(),
         LogFormat::Pretty => ts.init(),
-    };
+    }
 
     // Setup task tracker and cancellation token
     let tracker = TaskTracker::new();

gitjobs-server/src/templates/pagination.rs

@@ -1,5 +1,7 @@
 //! This module defines some types and functionality used to paginate.
 
+use std::fmt::Write as _;
+
 use anyhow::Result;
 use askama::Template;
 use serde::{Deserialize, Serialize};
@@ -142,12 +144,14 @@ pub(crate) fn build_url<T>(base_url: &str, filters: &T) -> Result<String>
 where
     T: Serialize + Pagination,
 {
-    let mut url = base_url.to_string();
-    let sep = get_url_filters_separator(&url);
+    let sep = get_url_filters_separator(base_url);
     let filters_params = serde_qs::to_string(filters)?;
+
+    let mut url = base_url.to_string();
     if !filters_params.is_empty() {
-        url.push_str(&format!("{sep}{filters_params}"));
+        write!(url, "{sep}{filters_params}")?;
     }
+
     Ok(url)
 }