diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 154acf9..3dfd506 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "server", "macros", diff --git a/backend/macros/Cargo.toml b/backend/macros/Cargo.toml index 6291521..2e8a8d5 100644 --- a/backend/macros/Cargo.toml +++ b/backend/macros/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "macros" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] tracing = "0.1.40" diff --git a/backend/macros/src/log.rs b/backend/macros/src/log.rs index b3aed4e..17bd26c 100644 --- a/backend/macros/src/log.rs +++ b/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) diff --git a/backend/markdown/Cargo.toml b/backend/markdown/Cargo.toml index e0ca45e..5ca020d 100644 --- a/backend/markdown/Cargo.toml +++ b/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" diff --git a/backend/markdown/src/lib.rs b/backend/markdown/src/lib.rs index 518d162..545f8c7 100644 --- a/backend/markdown/src/lib.rs +++ b/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}; diff --git a/backend/server/Cargo.toml b/backend/server/Cargo.toml index 33944ed..4acdf7d 100644 --- a/backend/server/Cargo.toml +++ b/backend/server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "server" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] macros = { path = "../macros" } diff --git a/backend/server/src/init/logger.rs b/backend/server/src/init/logger.rs index 57ee6be..887c633 100644 --- a/backend/server/src/init/logger.rs +++ b/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::SubscriberExt, Layer, Registry, + Layer, Registry, filter::LevelFilter, fmt, fmt::MakeWriter, fmt::format::Writer, + fmt::time::FormatTime, layer::SubscriberExt, }; struct LocalTimer; diff --git a/backend/server/src/init/mod.rs b/backend/server/src/init/mod.rs index 465d530..8710bb0 100644 --- a/backend/server/src/init/mod.rs +++ b/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; diff --git a/backend/server/src/modules/blog/api/get_page_count/mod.rs b/backend/server/src/modules/blog/api/get_page_count/mod.rs index c27a427..ce20576 100644 --- a/backend/server/src/modules/blog/api/get_page_count/mod.rs +++ b/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 serde_json::{json, Value}; -use sqlx::{query, PgPool, Row}; +use axum::{Json, extract::State}; +use serde_json::{Value, json}; +use sqlx::{PgPool, Row, query}; use tracing::error; const GET_PAGE_COUNT_QUERY: &str = include_str!("post_page_count.sql"); diff --git a/backend/server/src/modules/blog/api/get_post/mod.rs b/backend/server/src/modules/blog/api/get_post/mod.rs index 5e55731..91818db 100644 --- a/backend/server/src/modules/blog/api/get_post/mod.rs +++ b/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; diff --git a/backend/server/src/modules/blog/cron/check_update/mod.rs b/backend/server/src/modules/blog/cron/check_update/mod.rs index 4471e04..bc02d9c 100644 --- a/backend/server/src/modules/blog/cron/check_update/mod.rs +++ b/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) { +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) { diff --git a/backend/server/src/modules/blog/mod.rs b/backend/server/src/modules/blog/mod.rs index 9976b25..bdda532 100644 --- a/backend/server/src/modules/blog/mod.rs +++ b/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"; diff --git a/backend/server/src/modules/mod.rs b/backend/server/src/modules/mod.rs index dd7e83e..32089d8 100644 --- a/backend/server/src/modules/mod.rs +++ b/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; diff --git a/backend/server/src/scheduler/mod.rs b/backend/server/src/scheduler/mod.rs index edf5b1a..692ab24 100644 --- a/backend/server/src/scheduler/mod.rs +++ b/backend/server/src/scheduler/mod.rs @@ -1,8 +1,8 @@ use std::{ collections::HashMap, sync::{ - atomic::{AtomicBool, Ordering}, - Arc, RwLock, + atomic::{AtomicBool, Ordering}, Arc, + RwLock, }, thread, }; diff --git a/backend/server/src/utils/git.rs b/backend/server/src/utils/git.rs index cf906e6..9c48fc0 100644 --- a/backend/server/src/utils/git.rs +++ b/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,