From fe41c97bea51ac5122cf948b660f7c64c5bc90f6 Mon Sep 17 00:00:00 2001 From: core Date: Sun, 17 May 2026 14:28:06 -0400 Subject: [PATCH] chore(netcode-rewrite): reorganize dependencies --- Cargo.lock | 90 +-------------------------------------- Cargo.toml | 62 ++++++++++++++++++++++++++- crates/kabel/Cargo.toml | 3 +- crates/unified/Cargo.toml | 82 +++++++---------------------------- crates/xtask/Cargo.toml | 4 +- 5 files changed, 82 insertions(+), 159 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6a4be201593bbd3a1cdcbdcea228c44b0ea6747..c70de7a0e24819fd63758f6ba6905eb399b1c5ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -107,15 +107,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "alloca" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4" -dependencies = [ - "cc", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -2209,7 +2200,7 @@ dependencies = [ "cast", "ciborium", "clap", - "criterion-plot 0.5.0", + "criterion-plot", "is-terminal", "itertools 0.10.5", "num-traits", @@ -2225,31 +2216,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "criterion" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "950046b2aa2492f9a536f5f4f9a3de7b9e2476e575e05bd6c333371add4d98f3" -dependencies = [ - "alloca", - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot 0.8.2", - "itertools 0.13.0", - "num-traits", - "oorandom", - "page_size", - "plotters", - "rayon", - "regex", - "serde", - "serde_json", - "tinytemplate", - "walkdir", -] - [[package]] name = "criterion-plot" version = "0.5.0" @@ -2260,16 +2226,6 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "criterion-plot" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d80a2f4f5b554395e47b5d8305bc3d27813bacb73493eb1001e8f76dae29ea" -dependencies = [ - "cast", - "itertools 0.13.0", -] - [[package]] name = "critical-section" version = "1.2.0" @@ -3433,15 +3389,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -3541,7 +3488,6 @@ dependencies = [ name = "kabel" version = "0.1.0" dependencies = [ - "criterion 0.8.2", "test_each_file", ] @@ -4404,16 +4350,6 @@ dependencies = [ "ttf-parser", ] -[[package]] -name = "page_size" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "parking" version = "2.2.1" @@ -4891,7 +4827,7 @@ checksum = "6e7970b4e577b76a96d5e56b5f6662b66d1a4e1f5bb026ee118fc31b373c2752" dependencies = [ "arbitrary-chunks", "block-pseudorand", - "criterion 0.5.1", + "criterion", "partition", "tikv-jemallocator", "voracious_radix_sort", @@ -6607,22 +6543,6 @@ dependencies = [ "safe_arch", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" version = "0.1.11" @@ -6632,12 +6552,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows" version = "0.58.0" diff --git a/Cargo.toml b/Cargo.toml index 52f1a772fa0b32432e8db3c73a61fef1bf3dcdcd..ec1a644861d9fbe798e5427a199626c328e02848 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,67 @@ [workspace] resolver = "2" members = ["crates/*"] -exclude = ["launcher/src-tauri"] + +[workspace.dependencies] +bevy = { version = "0.18", default-features = false, features = [ + "serialize", + "tonemapping_luts", + "bevy_window", + "bevy_asset", + "bevy_winit", + "bevy_render", + "bevy_core_pipeline", + "bevy_sprite", + "bevy_text", + "bevy_ui", + "bevy_color", + "bevy_input_focus", + "bevy_log", + "multi_threaded", + "bevy_dev_tools", + "bevy_state", + "sprite_picking", + "mesh_picking", + "default_font", + "png", + "bevy_gizmos", + "bevy_gizmos_render", + "bevy_post_process", + "bevy_anti_alias", + "bevy_sprite_render", + "bevy_ui_render", + "zstd_rust", + "debug" +] } +avian2d = { version = "0.6", default-features = false, features = [ + "2d", + "f64", + "default-collider", + "parry-f64", + "xpbd_joints", + "bevy_picking", + "debug-plugin", + "parallel", + "serialize", + "enhanced-determinism" +] } +bevy_common_assets = { version = "0.16", features = ["toml"] } +tracing-subscriber = "0.3" +serde = { version = "1", features = ["derive"] } +rand = "0.10" +getrandom = "0.4" +wgpu = "*" +pico-args = "0.5" +leafwing-input-manager = "0.20" +good_lp = { version = "1.15", default-features = false, features = ["clarabel"] } +web-time = "1" +ctrlc = "3.5" +wasm-bindgen = "0.2.118" +tracing-web = "0.1" +console_error_panic_hook = "0.1" +test_each_file = "0.3.7" +colored = "3" +qsv-tabwriter = "2" [profile.dev] opt-level = 1 diff --git a/crates/kabel/Cargo.toml b/crates/kabel/Cargo.toml index 28b97fc1fd02ad17fa21642eec4896d023ae1da1..f363114550ce99521422064291ce885f12349830 100644 --- a/crates/kabel/Cargo.toml +++ b/crates/kabel/Cargo.toml @@ -4,8 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -criterion = "0.8.2" -test_each_file = "0.3.7" +test_each_file = { workspace = true } [features] timer = [] diff --git a/crates/unified/Cargo.toml b/crates/unified/Cargo.toml index cf858c8290a8c51d5dd13af1f4d7338234795d61..bafc3ceea0caa6617aad410c511f54bb1cc6f4ac 100644 --- a/crates/unified/Cargo.toml +++ b/crates/unified/Cargo.toml @@ -6,75 +6,26 @@ version = "0.1.0" [dependencies] -bevy = { version = "0.18", default-features = false, features = [ - "serialize", - "tonemapping_luts", - "bevy_window", - "bevy_asset", - "bevy_winit", - "bevy_render", - "bevy_core_pipeline", - "bevy_sprite", - "bevy_text", - "bevy_ui", - "bevy_color", - "bevy_input_focus", - "bevy_log", - "multi_threaded", - "bevy_dev_tools", - "bevy_state", - "sprite_picking", - "mesh_picking", - "default_font", - "png", - "bevy_gizmos", - "bevy_gizmos_render", - "bevy_post_process", - "bevy_anti_alias", - "bevy_sprite_render", - "bevy_ui_render", - "zstd_rust", - "debug" -] } - -avian2d = { version = "0.6", default-features = false, features = [ - "2d", - "f64", - "default-collider", - "parry-f64", - "xpbd_joints", - "bevy_picking", - "debug-plugin", - "parallel", - "serialize", - "enhanced-determinism" -]} -bevy_common_assets = { version = "0.16", features = ["toml"] } - -tracing-subscriber = "0.3" - -serde = { version = "1", features = ["derive"] } - -rand = "0.10" -getrandom = { version = "0.4", features = [] } - - -wgpu = "*" - -pico-args = "0.5" - -leafwing-input-manager = { version = "0.20" } -good_lp = { version = "1.15", default-features = false, features = ["clarabel"] } - -web-time = "1" +bevy = { workspace = true } +avian2d = { workspace = true } +bevy_common_assets = { workspace = true } +tracing-subscriber = { workspace = true } +serde = { workspace = true } +rand = { workspace = true } +getrandom = { workspace = true } +wgpu = { workspace = true } +pico-args = { workspace = true } +leafwing-input-manager = { workspace = true } +good_lp = { workspace = true } +web-time = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -ctrlc = { version = "3.5", optional = true } +ctrlc = { workspace = true, optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = { version = "0.2.118" } -tracing-web = "0.1" -console_error_panic_hook = "0.1" +wasm-bindgen = { workspace = true } +tracing-web = { workspace = true } +console_error_panic_hook = { workspace = true } [features] native_dev = [ @@ -89,4 +40,3 @@ native = [ "dep:ctrlc" ] wasm = ["getrandom/wasm_js", "bevy/webgl2"] - diff --git a/crates/xtask/Cargo.toml b/crates/xtask/Cargo.toml index a8af8c99cbf47469c552529990069812ae5e6db6..53e900224e7db66bc7839ad21d89a0efe5dbde6a 100644 --- a/crates/xtask/Cargo.toml +++ b/crates/xtask/Cargo.toml @@ -4,5 +4,5 @@ version = "0.1.0" edition = "2021" [dependencies] -colored = "3" -qsv-tabwriter = "2" \ No newline at end of file +colored = { workspace = true } +qsv-tabwriter = { workspace = true }