From 5ad175c2532880da714e82b283770a7a2a45364f Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Sat, 7 Feb 2026 18:38:17 +0800 Subject: Rename asset crate to asset_system --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 2 +- src/lib.rs | 8 ++++++-- systems/asset/Cargo.toml | 2 +- systems/asset/macros/src/lib.rs | 2 +- systems/asset/src/asset.rs | 12 ++++++------ systems/asset/test/Cargo.toml | 2 +- systems/asset/test/src/lib.rs | 2 +- 8 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc566c5..2d7e822 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,32 +81,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] -name = "asset" +name = "asset_macros" version = "0.1.0" dependencies = [ - "asset_macros", - "constants", + "proc-macro2", + "quote", "string_proc", - "thiserror 1.0.69", - "tokio", - "winapi", + "syn", ] [[package]] -name = "asset_macros" +name = "asset_system" version = "0.1.0" dependencies = [ - "proc-macro2", - "quote", + "asset_macros", + "constants", "string_proc", - "syn", + "thiserror 1.0.69", + "tokio", + "winapi", ] [[package]] name = "asset_test" version = "0.1.0" dependencies = [ - "asset", + "asset_system", "tokio", ] @@ -727,7 +727,7 @@ name = "just_enough_vcs" version = "0.0.0" dependencies = [ "action_system", - "asset", + "asset_system", "cfg_file", "chrono", "constants", diff --git a/Cargo.toml b/Cargo.toml index 68836ba..d7db01b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ tcp_connection = { path = "utils/tcp_connection" } string_proc = { path = "utils/string_proc" } # Systems -asset = { path = "systems/asset" } +asset_system = { path = "systems/asset" } action_system = { path = "systems/action" } constants = { path = "systems/_constants" } diff --git a/src/lib.rs b/src/lib.rs index 0abe27f..abf713c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,12 +15,16 @@ pub mod lib { } pub mod system { + pub mod constants { + pub use constants::*; + } + pub mod action_system { pub use action_system::*; } - pub mod constants { - pub use constants::*; + pub mod asset_system { + pub use asset_system::*; } } diff --git a/systems/asset/Cargo.toml b/systems/asset/Cargo.toml index 90ca9a7..5e86bbd 100644 --- a/systems/asset/Cargo.toml +++ b/systems/asset/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "asset" +name = "asset_system" edition = "2024" version.workspace = true diff --git a/systems/asset/macros/src/lib.rs b/systems/asset/macros/src/lib.rs index f186633..1535af0 100644 --- a/systems/asset/macros/src/lib.rs +++ b/systems/asset/macros/src/lib.rs @@ -16,7 +16,7 @@ pub fn rw_data_test_derive(input: TokenStream) -> TokenStream { #[cfg(test)] mod #test_mod_name { use super::*; - use asset::rw::RWData; + use asset_system::rw::RWData; #[tokio::test] async fn test() { diff --git a/systems/asset/src/asset.rs b/systems/asset/src/asset.rs index 247a654..78ee0e4 100644 --- a/systems/asset/src/asset.rs +++ b/systems/asset/src/asset.rs @@ -522,17 +522,17 @@ macro_rules! apply { ]; // Batch precheck - if let Err(e) = asset::asset::apply_precheck_rename_operations(&rename_ops).await { - return Err(asset::error::DataApplyError::PrecheckFailed(e)); + if let Err(e) = asset_system::asset::apply_precheck_rename_operations(&rename_ops).await { + return Err(asset_system::error::DataApplyError::PrecheckFailed(e)); } // Per-handle precheck - if let Err(e) = asset::asset::apply_precheck(&$first).await { - return Err(asset::error::DataApplyError::PrecheckFailed(e)); + if let Err(e) = asset_system::asset::apply_precheck(&$first).await { + return Err(asset_system::error::DataApplyError::PrecheckFailed(e)); } $( - if let Err(e) = asset::asset::apply_precheck(&$rest).await { - return Err(asset::error::DataApplyError::PrecheckFailed(e)); + if let Err(e) = asset_system::asset::apply_precheck(&$rest).await { + return Err(asset_system::error::DataApplyError::PrecheckFailed(e)); } )+ diff --git a/systems/asset/test/Cargo.toml b/systems/asset/test/Cargo.toml index 07c6282..3ac0779 100644 --- a/systems/asset/test/Cargo.toml +++ b/systems/asset/test/Cargo.toml @@ -4,6 +4,6 @@ version.workspace = true edition = "2024" [dependencies] -asset = { path = "../" } +asset_system = { path = "../" } tokio = { version = "1.48.0", features = ["full"] } diff --git a/systems/asset/test/src/lib.rs b/systems/asset/test/src/lib.rs index 79a840d..4aad777 100644 --- a/systems/asset/test/src/lib.rs +++ b/systems/asset/test/src/lib.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use asset::{ +use asset_system::{ RWDataTest, ensure_eq, error::{DataReadError, DataWriteError}, rw::RWData, -- cgit