From 5efbe048ebbcec20c0b106f6c008ed642cab4c44 Mon Sep 17 00:00:00 2001 From: Ap_Tx <3045929398@qq.com> Date: Thu, 1 Oct 2026 21:24:05 +0800 Subject: [PATCH] chore: cargo fmt --- apps/app/src/api/instance/mod.rs | 6 +++--- packages/app-lib/src/api/instance/mod.rs | 14 +++++++------- .../app-lib/src/api/instance/screenshot_groups.rs | 5 +++-- .../app-lib/src/api/instance/screenshots/mod.rs | 2 +- .../src/api/instance/screenshots/operations.rs | 2 +- .../src/api/instance/screenshots/reconciliation.rs | 2 +- .../src/state/instances/adapters/sqlite/mod.rs | 2 +- .../instances/adapters/sqlite/screenshot_rows.rs | 2 +- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/apps/app/src/api/instance/mod.rs b/apps/app/src/api/instance/mod.rs index 4eba43e..5535cb8 100644 --- a/apps/app/src/api/instance/mod.rs +++ b/apps/app/src/api/instance/mod.rs @@ -4,10 +4,10 @@ use chrono::NaiveDate; use dashmap::DashMap; use path_util::SafeRelativeUtf8UnixPathBuf; use serde::{Deserialize, Serialize}; -use tauri::Manager; -use tauri_plugin_opener::OpenerExt; use std::collections::HashMap; use std::path::{Path, PathBuf}; +use tauri::Manager; +use tauri_plugin_opener::OpenerExt; use theseus::data::{ AppliedContentSetPatch, ContentItem, Dependency, EditInstance as CoreEditInstance, InstanceInstallCandidate, @@ -1673,4 +1673,4 @@ pub async fn instance_open_screenshot( .reveal_item_in_dir(path) .map_err(|e| std::io::Error::other(e.to_string()))?; Ok(()) -} \ No newline at end of file +} diff --git a/packages/app-lib/src/api/instance/mod.rs b/packages/app-lib/src/api/instance/mod.rs index 067bdd9..ab61c55 100644 --- a/packages/app-lib/src/api/instance/mod.rs +++ b/packages/app-lib/src/api/instance/mod.rs @@ -72,13 +72,6 @@ pub use self::run::{ GcLaunchIntent, GcLaunchReport, QuickPlayType, kill, run, run_with_extra_launch_args, run_with_extra_launch_args_with_gc, }; -pub use self::upgrade::{ - dismiss_instance_post_upgrade_notice, execute_instance_upgrade, - get_instance_post_upgrade_notice, get_instance_upgrade_plan, - plan_instance_upgrade, reset_instance_upgrade_resolution, - resolve_custom_instance_upgrade_solution, select_instance_upgrade_solution, - update_instance_upgrade_resolution, update_instance_upgrade_resolutions, -}; pub use self::screenshot_groups::{ ScreenshotGroup, ScreenshotGroupImport, ScreenshotGroupMembershipUpdate, create_screenshot_group, delete_screenshot_group, import_screenshot_groups, @@ -92,4 +85,11 @@ pub use self::screenshots::{ list_all_screenshots, list_screenshots, list_synced_screenshots, move_screenshots, save_edited_screenshot, }; +pub use self::upgrade::{ + dismiss_instance_post_upgrade_notice, execute_instance_upgrade, + get_instance_post_upgrade_notice, get_instance_upgrade_plan, + plan_instance_upgrade, reset_instance_upgrade_resolution, + resolve_custom_instance_upgrade_solution, select_instance_upgrade_solution, + update_instance_upgrade_resolution, update_instance_upgrade_resolutions, +}; pub use crate::state::{DailyPlaytime, DailyPlaytimeEntry}; diff --git a/packages/app-lib/src/api/instance/screenshot_groups.rs b/packages/app-lib/src/api/instance/screenshot_groups.rs index bf78b3e..c024e0a 100644 --- a/packages/app-lib/src/api/instance/screenshot_groups.rs +++ b/packages/app-lib/src/api/instance/screenshot_groups.rs @@ -270,7 +270,8 @@ fn normalize_membership_updates( return Ok(updates); } Err(crate::ErrorKind::InputError( - "Screenshot membership update contains duplicate screenshots".to_string(), + "Screenshot membership update contains duplicate screenshots" + .to_string(), ) .into()) } @@ -345,4 +346,4 @@ async fn emit_screenshot_updates( ) .await; } -} \ No newline at end of file +} diff --git a/packages/app-lib/src/api/instance/screenshots/mod.rs b/packages/app-lib/src/api/instance/screenshots/mod.rs index 7ca206f..669a91a 100644 --- a/packages/app-lib/src/api/instance/screenshots/mod.rs +++ b/packages/app-lib/src/api/instance/screenshots/mod.rs @@ -7,4 +7,4 @@ pub use self::operations::{ list_all_screenshots, list_screenshots, list_synced_screenshots, move_screenshots, save_edited_screenshot, }; -pub(crate) use self::reconciliation::reconcile_screenshots; \ No newline at end of file +pub(crate) use self::reconciliation::reconcile_screenshots; diff --git a/packages/app-lib/src/api/instance/screenshots/operations.rs b/packages/app-lib/src/api/instance/screenshots/operations.rs index e905ef6..6217a70 100644 --- a/packages/app-lib/src/api/instance/screenshots/operations.rs +++ b/packages/app-lib/src/api/instance/screenshots/operations.rs @@ -647,4 +647,4 @@ fn unique_archive_folder( } unreachable!() -} \ No newline at end of file +} diff --git a/packages/app-lib/src/api/instance/screenshots/reconciliation.rs b/packages/app-lib/src/api/instance/screenshots/reconciliation.rs index e6c6d09..2569a3b 100644 --- a/packages/app-lib/src/api/instance/screenshots/reconciliation.rs +++ b/packages/app-lib/src/api/instance/screenshots/reconciliation.rs @@ -299,4 +299,4 @@ pub(super) async fn reconcile_source_screenshots( .collect::>(); sort_screenshots(&mut screenshots); Ok(screenshots) -} \ No newline at end of file +} diff --git a/packages/app-lib/src/state/instances/adapters/sqlite/mod.rs b/packages/app-lib/src/state/instances/adapters/sqlite/mod.rs index 49e16b0..d6c8e42 100644 --- a/packages/app-lib/src/state/instances/adapters/sqlite/mod.rs +++ b/packages/app-lib/src/state/instances/adapters/sqlite/mod.rs @@ -2,4 +2,4 @@ pub(crate) mod config_sync_rows; pub(crate) mod content_rows; pub(crate) mod instance_rows; pub(crate) mod loader_component_rows; -pub(crate) mod screenshot_rows; \ No newline at end of file +pub(crate) mod screenshot_rows; diff --git a/packages/app-lib/src/state/instances/adapters/sqlite/screenshot_rows.rs b/packages/app-lib/src/state/instances/adapters/sqlite/screenshot_rows.rs index 2dd6a6b..dad3684 100644 --- a/packages/app-lib/src/state/instances/adapters/sqlite/screenshot_rows.rs +++ b/packages/app-lib/src/state/instances/adapters/sqlite/screenshot_rows.rs @@ -233,4 +233,4 @@ pub(crate) async fn list_groups( ) .fetch_all(pool) .await?) -} \ No newline at end of file +}