From 794316c6e925097ef6b87693b4a610b4563309e6 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Wed, 11 Mar 2026 16:04:47 +0800 Subject: Consolidate dependencies using workspace inheritance --- Cargo.lock | 37 ++++++++++-------------------------- Cargo.toml | 10 ++++++++++ systems/_asset/Cargo.toml | 12 ++++++------ systems/_asset/macros/Cargo.toml | 8 ++++---- systems/_config/Cargo.toml | 1 + systems/_constants/macros/Cargo.toml | 10 +++++----- systems/_framework/Cargo.toml | 7 +++---- systems/sheet/Cargo.toml | 10 ++++------ 8 files changed, 43 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f8bd66..d349d5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,7 +124,7 @@ dependencies = [ "asset_macros", "constants", "just_fmt", - "thiserror 1.0.69", + "thiserror", "tokio", "winapi", ] @@ -395,6 +395,9 @@ checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" [[package]] name = "config_system" version = "0.1.0" +dependencies = [ + "serde", +] [[package]] name = "const-oid" @@ -697,7 +700,7 @@ name = "framework" version = "0.1.0" dependencies = [ "just_fmt", - "thiserror 2.0.17", + "thiserror", "tokio", ] @@ -1453,7 +1456,7 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.16", "libredox", - "thiserror 2.0.17", + "thiserror", ] [[package]] @@ -1736,7 +1739,7 @@ dependencies = [ "serde", "sha2 0.10.9", "sheet_system_macros", - "thiserror 2.0.17", + "thiserror", "tokio", ] @@ -1850,7 +1853,7 @@ dependencies = [ "rsa", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror", "tokio", "uuid", ] @@ -1864,33 +1867,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.17", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "thiserror-impl", ] [[package]] @@ -2043,7 +2026,7 @@ dependencies = [ "serde_json", "sha1_hash", "tcp_connection", - "thiserror 2.0.17", + "thiserror", "tokio", "vcs_data", ] diff --git a/Cargo.toml b/Cargo.toml index e67b07c..dff66cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,6 +57,16 @@ members = [ [workspace.package] version = "0.1.0" +[workspace.dependencies] +just_fmt = "0.1.2" +proc-macro2 = "1.0" +quote = "1.0" +regex = "1.12" +serde = { version = "1", features = ["derive"] } +syn = { version = "2.0", features = ["full", "extra-traits"] } +thiserror = "2" +tokio = { version = "1.50", features = ["full"] } + [profile.dev] opt-level = 0 debug = true diff --git a/systems/_asset/Cargo.toml b/systems/_asset/Cargo.toml index 12ac59c..c7586f6 100644 --- a/systems/_asset/Cargo.toml +++ b/systems/_asset/Cargo.toml @@ -4,12 +4,12 @@ edition = "2024" version.workspace = true [dependencies] -just_fmt = "0.1" - asset_macros = { path = "macros" } -tokio = { version = "1.48.0", features = ["full"] } -thiserror = "1.0.69" - -winapi = { version = "0.3", features = ["winnt"] } constants = { path = "../_constants" } + +just_fmt.workspace = true +thiserror.workspace = true +tokio.workspace = true + +winapi = { version = "0.3", features = ["winnt"] } diff --git a/systems/_asset/macros/Cargo.toml b/systems/_asset/macros/Cargo.toml index e096958..5a2ae25 100644 --- a/systems/_asset/macros/Cargo.toml +++ b/systems/_asset/macros/Cargo.toml @@ -7,7 +7,7 @@ edition = "2024" proc-macro = true [dependencies] -just_fmt = "0.1" -syn = { version = "2.0", features = ["full", "extra-traits"] } -quote = "1.0" -proc-macro2 = "1.0" +just_fmt.workspace = true +proc-macro2.workspace = true +quote.workspace = true +syn = { workspace = true, features = ["full", "extra-traits"] } diff --git a/systems/_config/Cargo.toml b/systems/_config/Cargo.toml index eacbcda..afc1d81 100644 --- a/systems/_config/Cargo.toml +++ b/systems/_config/Cargo.toml @@ -4,3 +4,4 @@ edition = "2024" version.workspace = true [dependencies] +serde.workspace = true diff --git a/systems/_constants/macros/Cargo.toml b/systems/_constants/macros/Cargo.toml index 1b1012b..22eff88 100644 --- a/systems/_constants/macros/Cargo.toml +++ b/systems/_constants/macros/Cargo.toml @@ -7,8 +7,8 @@ edition = "2024" proc-macro = true [dependencies] -syn = { version = "2.0", features = ["full", "extra-traits"] } -quote = "1.0" -proc-macro2 = "1.0" -regex = "1.12" -just_fmt = "0.1" +just_fmt.workspace = true +proc-macro2.workspace = true +quote.workspace = true +regex.workspace = true +syn.workspace = true diff --git a/systems/_framework/Cargo.toml b/systems/_framework/Cargo.toml index 286aec8..663b7be 100644 --- a/systems/_framework/Cargo.toml +++ b/systems/_framework/Cargo.toml @@ -4,7 +4,6 @@ edition = "2024" version.workspace = true [dependencies] -tokio = { version = "1.50", features = ["fs"] } -thiserror = "2" - -just_fmt = "0.1.2" +just_fmt.workspace = true +thiserror.workspace = true +tokio.workspace = true diff --git a/systems/sheet/Cargo.toml b/systems/sheet/Cargo.toml index 33d17dc..5296bf8 100644 --- a/systems/sheet/Cargo.toml +++ b/systems/sheet/Cargo.toml @@ -10,12 +10,10 @@ constants = { path = "../_constants" } sheet_system_macros = { path = "macros" } asset_system = { path = "../_asset" } -serde = { version = "1", features = ["derive"] } - -tokio = { version = "1.50", features = ["full"] } - -thiserror = "2" -just_fmt = "0.1.2" +serde.workspace = true +tokio.workspace = true +thiserror.workspace = true +just_fmt.workspace = true memmap2 = "0.9" sha2 = "0.10" -- cgit