From 7e5f0960b153ac992f23b1478adf10661ea7f55b Mon Sep 17 00:00:00 2001 From: phidiaLam <2957035701@qq.com> Date: Sun, 22 Sep 2024 01:06:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8Dregion?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=BA=8F=E5=88=97=E5=8C=96=E5=92=8C=E5=8F=8D?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mongo-models/src/ceobe/operation/tool_link/models/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence/models/mongo-models/src/ceobe/operation/tool_link/models/mod.rs b/persistence/models/mongo-models/src/ceobe/operation/tool_link/models/mod.rs index ae84915b..e4bdee0e 100644 --- a/persistence/models/mongo-models/src/ceobe/operation/tool_link/models/mod.rs +++ b/persistence/models/mongo-models/src/ceobe/operation/tool_link/models/mod.rs @@ -20,7 +20,7 @@ pub struct LocalizedTags { } #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)] -#[serde(rename_all_fields = "SCREAMING_SNAKE_CASE")] +#[serde(rename_all = "SCREAMING_SNAKE_CASE")] pub enum Region { ChinaMainland, ExceptChinaMainland, From 9ebfaf61ac603ea761360557aaba673f753e248c Mon Sep 17 00:00:00 2001 From: phidiaLam <2957035701@qq.com> Date: Sun, 22 Sep 2024 01:14:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20cargo=20fmt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database_traits/src/database_operates/db_op_impls.rs | 9 ++++++--- src/bootstrap/decorator.rs | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/persistence/database/database_traits/src/database_operates/db_op_impls.rs b/persistence/database/database_traits/src/database_operates/db_op_impls.rs index d39a67c1..439b17d8 100644 --- a/persistence/database/database_traits/src/database_operates/db_op_impls.rs +++ b/persistence/database/database_traits/src/database_operates/db_op_impls.rs @@ -32,10 +32,12 @@ where C: GetDatabaseTransaction, { type Error = C::Error; - type Transaction<'s> = C::Transaction<'s> + type Transaction<'s> + = C::Transaction<'s> where Self: 's; - type TransactionFuture<'s> = C::TransactionFuture<'s> + type TransactionFuture<'s> + = C::TransactionFuture<'s> where Self: 's; @@ -48,7 +50,8 @@ impl GetDatabaseCollection for DatabaseOperate where C: GetDatabaseCollection, { - type CollectGuard<'s> =C::CollectGuard<'s> + type CollectGuard<'s> + = C::CollectGuard<'s> where Self: 's; type Error = C::Error; diff --git a/src/bootstrap/decorator.rs b/src/bootstrap/decorator.rs index 29295753..f4348092 100644 --- a/src/bootstrap/decorator.rs +++ b/src/bootstrap/decorator.rs @@ -15,9 +15,11 @@ pub struct TimeoutDecorator( ); impl PrepareDecorator for TimeoutDecorator { - type OutFut< Fut, T> = LocalBoxFuture<'static,Result> - - where Fut: Future> +'static,T: 'static; + type OutFut + = LocalBoxFuture<'static, Result> + where + Fut: Future> + 'static, + T: 'static; fn decorator( &self, src: &'static str, in_fut: Fut,