From 9f2fc987783eb8bccb423c5326d4c82de719356c Mon Sep 17 00:00:00 2001 From: ghostly_zsh Date: Mon, 24 Mar 2025 21:03:06 -0500 Subject: [PATCH] shut up cargo.lock --- Cargo.lock | 416 ++++++++++++++++++----------------------------------- 1 file changed, 137 insertions(+), 279 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4515679c2d7eac3b97aeacb87a0097ffdef34e6..b44a50613548cb019171448a387573eb49e3aa76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -558,15 +558,6 @@ dependencies = [ "libloading 0.7.4", ] -[[package]] -name = "ash" -version = "0.38.0+1.3.281" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" -dependencies = [ - "libloading 0.8.5", -] - [[package]] name = "assert_type_match" version = "0.1.1" @@ -1237,7 +1228,7 @@ dependencies = [ "hexasphere", "image 0.24.9", "js-sys", - "naga 0.19.2", + "naga", "naga_oil", "profiling", "serde", @@ -1245,7 +1236,7 @@ dependencies = [ "thread_local", "wasm-bindgen", "web-sys", - "wgpu 0.19.4", + "wgpu", ] [[package]] @@ -1400,7 +1391,7 @@ dependencies = [ "ahash", "bevy_utils_proc_macros 0.13.2", "getrandom", - "hashbrown 0.14.5", + "hashbrown", "nonmax", "petgraph", "smallvec", @@ -1419,7 +1410,7 @@ dependencies = [ "ahash", "bevy_utils_proc_macros 0.15.1", "getrandom", - "hashbrown 0.14.5", + "hashbrown", "thread_local", "tracing", "web-time 1.1.0", @@ -1514,16 +1505,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec 0.6.3", -] - -[[package]] -name = "bit-set" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" -dependencies = [ - "bit-vec 0.8.0", + "bit-vec", ] [[package]] @@ -1535,12 +1517,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bit-vec" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" - [[package]] name = "bit_field" version = "0.10.2" @@ -1700,9 +1676,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.21.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" +checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" dependencies = [ "bytemuck_derive", ] @@ -1888,6 +1864,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + [[package]] name = "chrono" version = "0.4.39" @@ -2598,9 +2583,9 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "ecolor" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d72e9c39f6e11a2e922d04a34ec5e7ef522ea3f5a1acfca7a19d16ad5fe50f5" +checksum = "bc4feb366740ded31a004a0e4452fbf84e80ef432ecf8314c485210229672fd1" dependencies = [ "bytemuck", "emath", @@ -2608,11 +2593,12 @@ dependencies = [ [[package]] name = "egui" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252d52224d35be1535d7fd1d6139ce071fb42c9097773e79f7665604f5596b5e" +checksum = "25dd34cec49ab55d85ebf70139cb1ccd29c977ef6b6ba4fe85489d6877ee9ef3" dependencies = [ "ahash", + "bitflags 2.6.0", "emath", "epaint", "log", @@ -2621,37 +2607,38 @@ dependencies = [ ] [[package]] -name = "egui-wgpu" -version = "0.30.0" +name = "egui-winit" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c1e821d2d8921ef6ce98b258c7e24d9d6aab2ca1f9cdf374eca997e7f67f59" +checksum = "7d9dfbb78fe4eb9c3a39ad528b90ee5915c252e77bbab9d4ebc576541ab67e13" dependencies = [ "ahash", "bytemuck", - "document-features", "egui", - "epaint", "log", "profiling", - "thiserror 1.0.69", - "type-map", + "raw-window-handle", "web-time 1.1.0", - "wgpu 23.0.1", + "webbrowser", + "winit 0.30.8", ] [[package]] -name = "egui-winit" -version = "0.30.0" +name = "egui_glow" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e84c2919cd9f3a38a91e8f84ac6a245c19251fd95226ed9fae61d5ea564fce3" +checksum = "910906e3f042ea6d2378ec12a6fd07698e14ddae68aed2d819ffe944a73aab9e" dependencies = [ "ahash", + "bytemuck", "egui", + "egui-winit", + "glow 0.16.0", "log", + "memoffset", "profiling", - "raw-window-handle", - "web-time 1.1.0", - "webbrowser", + "wasm-bindgen", + "web-sys", "winit 0.30.8", ] @@ -2677,9 +2664,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe73c1207b864ee40aa0b0c038d6092af1030744678c60188a05c28553515d" +checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b" dependencies = [ "bytemuck", ] @@ -2746,9 +2733,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5666f8d25236293c966fbb3635eac18b04ad1914e3bab55bc7d44b9980cafcac" +checksum = "41fcc0f5a7c613afd2dee5e4b30c3e6acafb8ad6f0edb06068811f708a67c562" dependencies = [ "ab_glyph", "ahash", @@ -2764,9 +2751,9 @@ dependencies = [ [[package]] name = "epaint_default_fonts" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f6ddac3e6ac6fd4c3d48bb8b1943472f8da0f43a4303bcd8a18aa594401c80" +checksum = "fc7e7a64c02cf7a5b51e745a9e45f60660a286f151c238b9d397b3e923f5082f" [[package]] name = "equivalent" @@ -2912,12 +2899,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" - [[package]] name = "fontconfig-parser" version = "0.5.7" @@ -3201,9 +3182,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" +checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" dependencies = [ "js-sys", "slotmap", @@ -3211,6 +3192,63 @@ dependencies = [ "web-sys", ] +[[package]] +name = "glutin" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03642b8b0cce622392deb0ee3e88511f75df2daac806102597905c3ea1974848" +dependencies = [ + "bitflags 2.6.0", + "cfg_aliases 0.2.1", + "cgl", + "core-foundation", + "dispatch", + "glutin_egl_sys", + "glutin_glx_sys", + "glutin_wgl_sys 0.6.1", + "libloading 0.8.5", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", + "once_cell", + "raw-window-handle", + "wayland-sys", + "windows-sys 0.52.0", + "x11-dl", +] + +[[package]] +name = "glutin-winit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f" +dependencies = [ + "cfg_aliases 0.2.1", + "glutin", + "raw-window-handle", + "winit 0.30.8", +] + +[[package]] +name = "glutin_egl_sys" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4680ba6195f424febdc3ba46e7a42a0e58743f2edb115297b86d7f8ecc02d2" +dependencies = [ + "gl_generator", + "windows-sys 0.52.0", +] + +[[package]] +name = "glutin_glx_sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7bb2938045a88b612499fbcba375a77198e01306f52272e692f8c1f3751185" +dependencies = [ + "gl_generator", + "x11-dl", +] + [[package]] name = "glutin_wgl_sys" version = "0.5.0" @@ -3222,9 +3260,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" +checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e" dependencies = [ "gl_generator", ] @@ -3261,18 +3299,6 @@ dependencies = [ "windows 0.52.0", ] -[[package]] -name = "gpu-allocator" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" -dependencies = [ - "log", - "presser", - "thiserror 1.0.69", - "windows 0.58.0", -] - [[package]] name = "gpu-descriptor" version = "0.2.4" @@ -3280,19 +3306,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.6.0", - "gpu-descriptor-types 0.1.2", - "hashbrown 0.14.5", -] - -[[package]] -name = "gpu-descriptor" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca" -dependencies = [ - "bitflags 2.6.0", - "gpu-descriptor-types 0.2.0", - "hashbrown 0.15.2", + "gpu-descriptor-types", + "hashbrown", ] [[package]] @@ -3304,15 +3319,6 @@ dependencies = [ "bitflags 2.6.0", ] -[[package]] -name = "gpu-descriptor-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" -dependencies = [ - "bitflags 2.6.0", -] - [[package]] name = "grid" version = "0.10.0" @@ -3369,15 +3375,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" -dependencies = [ - "foldhash", -] - [[package]] name = "hassle-rs" version = "0.11.0" @@ -3625,7 +3622,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -4073,25 +4070,19 @@ dependencies = [ ] [[package]] -name = "metal" -version = "0.27.0" +name = "memoffset" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "bitflags 2.6.0", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", - "paste", + "autocfg", ] [[package]] name = "metal" -version = "0.29.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ "bitflags 2.6.0", "block", @@ -4173,7 +4164,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ - "bit-set 0.5.3", + "bit-set", "bitflags 2.6.0", "codespan-reporting", "hexf-parse", @@ -4188,38 +4179,17 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "naga" -version = "23.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364f94bc34f61332abebe8cad6f6cd82a5b65cff22c828d05d0968911462ca4f" -dependencies = [ - "arrayvec", - "bit-set 0.8.0", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "rustc-hash", - "spirv", - "termcolor", - "thiserror 1.0.69", - "unicode-xid", -] - [[package]] name = "naga_oil" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1" dependencies = [ - "bit-set 0.5.3", + "bit-set", "codespan-reporting", "data-encoding", "indexmap", - "naga 0.19.2", + "naga", "once_cell", "regex", "regex-syntax 0.8.4", @@ -5243,7 +5213,7 @@ source = "git+https://github.com/ghostlyzsh/rapier.git#0ac5a2906d4ffbfba346bf327 dependencies = [ "approx", "arrayvec", - "bit-vec 0.6.3", + "bit-vec", "bitflags 1.3.2", "crossbeam", "downcast-rs", @@ -5947,7 +5917,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "766195f983f4098dc3bf37fb66bd609f6e6258c4b8db684d05252b2c694cdbcd" dependencies = [ - "hashbrown 0.14.5", + "hashbrown", "num-traits", "robust", "smallvec", @@ -6024,13 +5994,17 @@ name = "starkingdoms-client" version = "0.1.0" dependencies = [ "bevy_ecs 0.15.1", + "bytemuck", "console_error_panic_hook", "crossbeam", "egui", - "egui-wgpu", "egui-winit", + "egui_glow", "ehttp", "futures", + "glow 0.16.0", + "glutin", + "glutin-winit", "image 0.25.5", "nalgebra 0.33.2", "poll-promise", @@ -6048,7 +6022,6 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "web-time 1.1.0", - "wgpu 23.0.1", "winit 0.30.8", ] @@ -6744,15 +6717,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "type-map" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" -dependencies = [ - "rustc-hash", -] - [[package]] name = "typeid" version = "1.0.0" @@ -7262,32 +7226,7 @@ dependencies = [ "cfg_aliases 0.1.1", "js-sys", "log", - "naga 0.19.2", - "parking_lot", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.19.4", - "wgpu-hal 0.19.5", - "wgpu-types 0.19.2", -] - -[[package]] -name = "wgpu" -version = "23.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f70000db37c469ea9d67defdc13024ddf9a5f1b89cb2941b812ad7cde1735a" -dependencies = [ - "arrayvec", - "cfg_aliases 0.1.1", - "document-features", - "js-sys", - "log", - "naga 23.1.0", + "naga", "parking_lot", "profiling", "raw-window-handle", @@ -7296,9 +7235,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 23.0.1", - "wgpu-hal 23.0.1", - "wgpu-types 23.0.0", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -7308,13 +7247,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" dependencies = [ "arrayvec", - "bit-vec 0.6.3", + "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", "indexmap", "log", - "naga 0.19.2", + "naga", "once_cell", "parking_lot", "profiling", @@ -7323,33 +7262,8 @@ dependencies = [ "smallvec", "thiserror 1.0.69", "web-sys", - "wgpu-hal 0.19.5", - "wgpu-types 0.19.2", -] - -[[package]] -name = "wgpu-core" -version = "23.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63c3c478de8e7e01786479919c8769f62a22eec16788d8c2ac77ce2c132778a" -dependencies = [ - "arrayvec", - "bit-vec 0.8.0", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", - "document-features", - "indexmap", - "log", - "naga 23.1.0", - "once_cell", - "parking_lot", - "profiling", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror 1.0.69", - "wgpu-hal 23.0.1", - "wgpu-types 23.0.0", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -7360,8 +7274,8 @@ checksum = "bfabcfc55fd86611a855816326b2d54c3b2fd7972c27ce414291562650552703" dependencies = [ "android_system_properties", "arrayvec", - "ash 0.37.3+1.3.251", - "bit-set 0.5.3", + "ash", + "bit-set", "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", @@ -7370,16 +7284,16 @@ dependencies = [ "glow 0.13.1", "glutin_wgl_sys 0.5.0", "gpu-alloc", - "gpu-allocator 0.25.0", - "gpu-descriptor 0.2.4", + "gpu-allocator", + "gpu-descriptor", "hassle-rs", "js-sys", "khronos-egl", "libc", "libloading 0.8.5", "log", - "metal 0.27.0", - "naga 0.19.2", + "metal", + "naga", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", @@ -7393,55 +7307,10 @@ dependencies = [ "thiserror 1.0.69", "wasm-bindgen", "web-sys", - "wgpu-types 0.19.2", + "wgpu-types", "winapi", ] -[[package]] -name = "wgpu-hal" -version = "23.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89364b8a0b211adc7b16aeaf1bd5ad4a919c1154b44c9ce27838213ba05fd821" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash 0.38.0+1.3.281", - "bit-set 0.8.0", - "bitflags 2.6.0", - "block", - "bytemuck", - "cfg_aliases 0.1.1", - "core-graphics-types", - "glow 0.14.2", - "glutin_wgl_sys 0.6.0", - "gpu-alloc", - "gpu-allocator 0.27.0", - "gpu-descriptor 0.3.1", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.5", - "log", - "metal 0.29.0", - "naga 23.1.0", - "ndk-sys 0.5.0+25.2.9519653", - "objc", - "once_cell", - "parking_lot", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys", - "rustc-hash", - "smallvec", - "thiserror 1.0.69", - "wasm-bindgen", - "web-sys", - "wgpu-types 23.0.0", - "windows 0.58.0", - "windows-core 0.58.0", -] - [[package]] name = "wgpu-types" version = "0.19.2" @@ -7453,17 +7322,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wgpu-types" -version = "23.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068" -dependencies = [ - "bitflags 2.6.0", - "js-sys", - "web-sys", -] - [[package]] name = "which" version = "4.4.2"