From 21a82593717260a37c188eae6a39cf3e7f18228d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 23:23:17 +0000 Subject: [PATCH 1/2] Update yuuka requirement from ^0.3 to ^0.4 in the cargo-deps group Updates the requirements on [yuuka](https://github.com/celestia-island/yuuka) to permit the latest version. Updates `yuuka` to 0.4.0 - [Commits](https://github.com/celestia-island/yuuka/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: yuuka dependency-type: direct:production dependency-group: cargo-deps ... Signed-off-by: dependabot[bot] --- packages/types/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/types/Cargo.toml b/packages/types/Cargo.toml index 35dc975..4930318 100644 --- a/packages/types/Cargo.toml +++ b/packages/types/Cargo.toml @@ -21,5 +21,5 @@ strum = { workspace = true } uuid = { workspace = true } log = { workspace = true } -yuuka = "^0.3" +yuuka = "^0.4" sea-orm = { workspace = true } From cc8b7461a78af7d2be5b34eb7fd481a10e0b2d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BC=8A=E6=AC=A7?= Date: Sat, 9 Nov 2024 21:45:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9D=20Fix=20macros.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/types/src/config.rs | 5 +++-- packages/types/src/i18n.rs | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/types/src/config.rs b/packages/types/src/config.rs index fa9bfeb..ba943de 100644 --- a/packages/types/src/config.rs +++ b/packages/types/src/config.rs @@ -1,13 +1,14 @@ use anyhow::{anyhow, Result}; use once_cell::sync::Lazy; +use serde::{Deserialize, Serialize}; use std::sync::{Arc, Mutex}; - use yuuka::derive_struct; use crate::consts::CACHE_DIR; derive_struct!( - #[serde(rename_all = "kebab-case")] + #[derive(PartialEq, Serialize, Deserialize)] + #[macros_recursive(serde(rename_all = "kebab-case"))] pub Config { portal: { title_suffix: String, diff --git a/packages/types/src/i18n.rs b/packages/types/src/i18n.rs index fb1e99f..13d1b90 100644 --- a/packages/types/src/i18n.rs +++ b/packages/types/src/i18n.rs @@ -3,7 +3,8 @@ use serde::{Deserialize, Serialize}; use yuuka::derive_struct; derive_struct!( - #[serde(rename_all = "kebab-case")] + #[derive(Serialize, Deserialize)] + #[macros_recursive(serde(rename_all = "kebab-case"))] pub Config { header: { welcome: String,