From b1e40d8b68d8550a3edc62b3d3b71015b584c7a0 Mon Sep 17 00:00:00 2001 From: Suzumiya Date: Mon, 5 Oct 2026 20:00:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B9=B0=E6=96=AD=E5=88=B6?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E5=88=86=E6=94=AF=E9=81=97=E7=95=99=E7=9A=84?= =?UTF-8?q?=20Rust=20=E6=A0=BC=E5=BC=8F=E5=81=8F=E5=B7=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - server-rs/crates/pingora-gateway/src/main.rs：播放会话代理测试中的 assert! 断言按 rustfmt 收成单行。 - server-rs/crates/spacetime-client/src/active.rs：游戏分发购买相关 use 导入列表按 rustfmt 重新断行。 - server-rs/crates/spacetime-client/src/active/mapper.rs：游戏分发记录类型与映射函数的 pub use 导入列表按 rustfmt 重新断行（两处）。 - server-rs/crates/spacetime-client/src/active/mapper/game_distribution.rs：购买结果映射的 result.purchase.map 链式调用按 rustfmt 换行。 - 仅格式变动，不改变行为；改动前 npm run check:rustfmt 在上一提交 8d8e74ca6 报这 4 个文件，改动后转绿（master 96859666f 上同为绿）。 --- server-rs/crates/pingora-gateway/src/main.rs | 5 +---- .../crates/spacetime-client/src/active.rs | 9 ++++----- .../spacetime-client/src/active/mapper.rs | 13 ++++++------- .../src/active/mapper/game_distribution.rs | 18 ++++++++++-------- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/server-rs/crates/pingora-gateway/src/main.rs b/server-rs/crates/pingora-gateway/src/main.rs index 78c5d45fc..28038c70d 100644 --- a/server-rs/crates/pingora-gateway/src/main.rs +++ b/server-rs/crates/pingora-gateway/src/main.rs @@ -4132,10 +4132,7 @@ mod tests { "/api", ] { assert!(!is_play_session_proxy_path(path), "path: {path}"); - assert!( - !route_clears_cookie(&classify_path(path)), - "path: {path}" - ); + assert!(!route_clears_cookie(&classify_path(path)), "path: {path}"); assert_eq!( classify_path(path), RouteDecision::Proxy { diff --git a/server-rs/crates/spacetime-client/src/active.rs b/server-rs/crates/spacetime-client/src/active.rs index 6ce029f33..620367bb7 100644 --- a/server-rs/crates/spacetime-client/src/active.rs +++ b/server-rs/crates/spacetime-client/src/active.rs @@ -29,11 +29,10 @@ pub use game_distribution::{ GameDistributionFailUploadRecordInput, GameDistributionGetGameRecordInput, GameDistributionOwnerGameListRecordInput, GameDistributionPlayCountIncrementRecordInput, GameDistributionPublicGameListRecordInput, GameDistributionPurchaseRecordInput, - GameDistributionRejectRecordInput, - GameDistributionRestoreRecordInput, GameDistributionReviewGameListRecordInput, - GameDistributionReviewModerationRecordInput, GameDistributionSubmitReviewRecordInput, - GameDistributionSuspendRecordInput, GameDistributionUnpublishRecordInput, - GameDistributionUpdateMetadataRecordInput, + GameDistributionRejectRecordInput, GameDistributionRestoreRecordInput, + GameDistributionReviewGameListRecordInput, GameDistributionReviewModerationRecordInput, + GameDistributionSubmitReviewRecordInput, GameDistributionSuspendRecordInput, + GameDistributionUnpublishRecordInput, GameDistributionUpdateMetadataRecordInput, }; #[path = "active/external_generation.rs"] pub mod external_generation; diff --git a/server-rs/crates/spacetime-client/src/active/mapper.rs b/server-rs/crates/spacetime-client/src/active/mapper.rs index 68d25da52..8edb8c183 100644 --- a/server-rs/crates/spacetime-client/src/active/mapper.rs +++ b/server-rs/crates/spacetime-client/src/active/mapper.rs @@ -99,11 +99,10 @@ pub use self::game_distribution::{ GameDistributionAdminVersionRecord, GameDistributionGameRecord, GameDistributionOwnerGameRecord, GameDistributionPublicGameRecord, GameDistributionPurchaseRecord, GameDistributionRatingSummaryRecord, - GameDistributionReviewGameListRecord, - GameDistributionReviewGameRecord, GameDistributionReviewModerationOperationRecord, - GameDistributionReviewModerationRecord, GameDistributionUserReviewListRecord, - GameDistributionUserReviewRecord, GameDistributionUserReviewSaveRecord, - GameDistributionVersionRecord, + GameDistributionReviewGameListRecord, GameDistributionReviewGameRecord, + GameDistributionReviewModerationOperationRecord, GameDistributionReviewModerationRecord, + GameDistributionUserReviewListRecord, GameDistributionUserReviewRecord, + GameDistributionUserReviewSaveRecord, GameDistributionVersionRecord, }; pub use self::llm_router_account::{LlmRouterAccountRecord, LlmRouterAccountUpsertRecordInput}; pub use self::payment::{ @@ -171,8 +170,8 @@ pub(crate) use self::game_distribution::{ map_game_distribution_admin_game_list_result, map_game_distribution_game_result, map_game_distribution_owner_game_list_result, map_game_distribution_public_game_list_result, map_game_distribution_public_game_result, map_game_distribution_purchase_result, - map_game_distribution_review_list_result, - map_game_distribution_version_result, map_review_moderation_operation, map_user_review, + map_game_distribution_review_list_result, map_game_distribution_version_result, + map_review_moderation_operation, map_user_review, }; pub(crate) use self::payment::{ map_payment_api_key_list_result, map_payment_api_key_result, map_payment_app_list_result, diff --git a/server-rs/crates/spacetime-client/src/active/mapper/game_distribution.rs b/server-rs/crates/spacetime-client/src/active/mapper/game_distribution.rs index 159c52b05..d84f9c04e 100644 --- a/server-rs/crates/spacetime-client/src/active/mapper/game_distribution.rs +++ b/server-rs/crates/spacetime-client/src/active/mapper/game_distribution.rs @@ -472,14 +472,16 @@ pub(crate) fn map_game_distribution_purchase_result( return Err(SpacetimeClientError::procedure_failed(result.error_message)); } Ok(( - result.purchase.map(|purchase| GameDistributionPurchaseRecord { - purchase_id: purchase.purchase_id, - game_id: purchase.game_id, - user_id: purchase.user_id, - price_mud_points: purchase.price_mud_points, - wallet_ledger_id: purchase.wallet_ledger_id, - created_at: shared_kernel::format_timestamp_micros(purchase.created_at_micros), - }), + result + .purchase + .map(|purchase| GameDistributionPurchaseRecord { + purchase_id: purchase.purchase_id, + game_id: purchase.game_id, + user_id: purchase.user_id, + price_mud_points: purchase.price_mud_points, + wallet_ledger_id: purchase.wallet_ledger_id, + created_at: shared_kernel::format_timestamp_micros(purchase.created_at_micros), + }), result.wallet_balance, result.replayed, ))