feat(backend) cargo fmt & migration to rust 2024

backend/Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "server",
     "macros",

backend/macros/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "macros"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 tracing = "0.1.40"

backend/macros/src/log.rs

@@ -44,7 +44,7 @@ mod tests {
         use std::io;
         use tracing::Level;
         use tracing_subscriber::prelude::*;
-        use tracing_subscriber::{fmt, Registry};
+        use tracing_subscriber::{Registry, fmt};
 
         let format = tracing_subscriber::fmt::format()
             .with_level(true)

backend/markdown/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "markdown"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] }
 serde = { version = "1.0.209", features = ["derive"] }
 serde_json = "1.0.128"
 regex = "1.10.4"
-yaml-rust2 = "0.9.0"
+yaml-rust2 = "0.10.0"
 sha2 = "0.10.8"
 base64 = "0.22.1"
 thiserror = "2.0.3"

backend/markdown/src/lib.rs

@@ -8,7 +8,7 @@ use std::str::FromStr;
 use crate::error::Error;
 use crate::utils::front_matter::{parse_front_matter, split_md_front_matter};
 
-use base64::{engine::general_purpose, Engine};
+use base64::{Engine, engine::general_purpose};
 use serde::Serialize;
 use serde_json::Value;
 use sha2::{Digest, Sha256};

backend/server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "server"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 macros = { path = "../macros" }

backend/server/src/init/logger.rs

@@ -8,8 +8,8 @@ use dirs::home_dir;
 use tracing::info;
 use tracing_appender::{non_blocking, non_blocking::WorkerGuard, rolling};
 use tracing_subscriber::{
-    filter::LevelFilter, fmt, fmt::format::Writer, fmt::time::FormatTime, fmt::MakeWriter,
+    Layer, Registry, filter::LevelFilter, fmt, fmt::MakeWriter, fmt::format::Writer,
-    layer::SubscriberExt, Layer, Registry,
+    fmt::time::FormatTime, layer::SubscriberExt,
 };
 
 struct LocalTimer;

backend/server/src/init/mod.rs

@@ -4,7 +4,7 @@ mod misc;
 
 use std::{env, panic};
 
-use crate::modules::{blog::Blog, ModuleTree};
+use crate::modules::{ModuleTree, blog::Blog};
 use macros::error_panic;
 
 use tracing::info;

backend/server/src/modules/blog/api/get_page_count/mod.rs

@@ -1,8 +1,8 @@
 use crate::constants::blog::PAGE_SIZE;
 
-use axum::{extract::State, Json};
+use axum::{Json, extract::State};
-use serde_json::{json, Value};
+use serde_json::{Value, json};
-use sqlx::{query, PgPool, Row};
+use sqlx::{PgPool, Row, query};
 use tracing::error;
 
 const GET_PAGE_COUNT_QUERY: &str = include_str!("post_page_count.sql");

backend/server/src/modules/blog/api/get_post/mod.rs

@@ -2,8 +2,8 @@ use macros::dev_consume;
 
 use axum::response::IntoResponse;
 use axum::{
-    extract::{Path, State},
     Json,
+    extract::{Path, State},
 };
 use serde_json::json;
 use sqlx::PgPool;

backend/server/src/modules/blog/cron/check_update/mod.rs

@@ -15,14 +15,14 @@ use crate::{
 use macros::panic_with_log;
 
 use git2::{Delta, Repository};
-use sqlx::{Pool, Postgres};
+use sqlx::{PgPool, Pool, Postgres};
 use tracing::{error, info, warn, Level};
 
 mod error;
 mod index;
 mod utils;
 
-pub fn task(db_connection: &Pool<Postgres>) {
+pub fn task(db_connection: &PgPool) {
     // init
     let git_work_dir = {
         let path = if let Ok(default_log_path) = env::var(var_name::WORK_DIR) {

backend/server/src/modules/blog/mod.rs

@@ -3,6 +3,7 @@ mod cron;
 
 use crate::{
     modules::{
+        Module,
         blog::{
             api::{
                 get_page_count,
@@ -11,12 +12,11 @@ use crate::{
             },
             // cron::check_update,
         },
-        Module,
     },
     scheduler::tasks::CronTask,
 };
 
-use axum::{routing::get, Router};
+use axum::{Router, routing::get};
 use sqlx::PgPool;
 
 const MOUNT_POINT: &str = "/blog";

backend/server/src/modules/mod.rs

@@ -5,7 +5,7 @@ use std::num::ParseIntError;
 
 use crate::{
     constants::config::server::{default_value, var_name},
-    scheduler::{tasks::CronTask, Scheduler},
+    scheduler::{Scheduler, tasks::CronTask},
 };
 use macros::error_panic;
 

backend/server/src/scheduler/mod.rs

@@ -1,8 +1,8 @@
 use std::{
     collections::HashMap,
     sync::{
-        atomic::{AtomicBool, Ordering},
+        atomic::{AtomicBool, Ordering}, Arc,
-        Arc, RwLock,
+        RwLock,
     },
     thread,
 };

backend/server/src/utils/git.rs

@@ -3,12 +3,11 @@
 /// https://github.com/rust-lang/git2-rs/commit/f3b87baed1e33d6c2d94fe1fa6aa6503a071d837
 ///
 use git2::{
-    build, AnnotatedCommit, AutotagOption, Delta, FetchOptions, Reference, Remote, Repository,
+    AnnotatedCommit, AutotagOption, Delta, FetchOptions, Reference, Remote, Repository, build,
 };
 use std::path::PathBuf;
 use tracing::{error, warn};
 
-
 #[derive(Debug, Eq, PartialEq)]
 pub struct FileDelta {
     pub old_path: Option<PathBuf>,