diff --git a/Cargo.lock b/Cargo.lock index bd053c3..1eaed66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -561,12 +561,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -614,9 +608,9 @@ checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitcode" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf300f4aa6e66f3bdff11f1236a88c622fe47ea814524792240b4d554d9858ee" +checksum = "648bd963d2e5d465377acecfb4b827f9f553b6bc97a8f61715779e9ed9e52b74" dependencies = [ "arrayvec", "bitcode_derive", @@ -627,9 +621,9 @@ dependencies = [ [[package]] name = "bitcode_derive" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b6b4cb608b8282dc3b53d0f4c9ab404655d562674c682db7e6c0458cc83c23" +checksum = "ffebfc2d28a12b262c303cb3860ee77b91bd83b1f20f0bd2a9693008e2f55a9e" dependencies = [ "proc-macro2", "quote", @@ -1189,7 +1183,17 @@ version = "0.31.1" source = "git+https://github.com/BloodStainedCrow/egui?branch=removeProfiling#4e11a02615078f509d9acc474ae13a66b411eaf7" dependencies = [ "bytemuck", - "emath 0.31.1 (git+https://github.com/BloodStainedCrow/egui?branch=removeProfiling)", + "emath 0.31.1", + "serde", +] + +[[package]] +name = "ecolor" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a7fc3172c2ef56966b2ce4f84177e159804c40b9a84de8861558ce4a59f422" +dependencies = [ + "emath 0.32.1", "serde", ] @@ -1201,7 +1205,7 @@ dependencies = [ "ahash", "bytemuck", "document-features", - "egui", + "egui 0.31.1", "egui-wgpu", "egui-winit", "egui_glow", @@ -1238,16 +1242,34 @@ dependencies = [ "accesskit", "ahash", "bitflags 2.9.1", - "emath 0.31.1 (git+https://github.com/BloodStainedCrow/egui?branch=removeProfiling)", - "epaint", + "emath 0.31.1", + "epaint 0.31.1", "log", "nohash-hasher", "profiling", - "ron 0.10.1", "serde", "unicode-segmentation", ] +[[package]] +name = "egui" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e2be082f77715496b4a39fdc6f5dc7491fefe2833111781b8697ea6ee919a7" +dependencies = [ + "accesskit", + "ahash", + "bitflags 2.9.1", + "emath 0.32.1", + "epaint 0.32.1", + "nohash-hasher", + "profiling", + "ron", + "serde", + "smallvec", + "unicode-segmentation", +] + [[package]] name = "egui-wgpu" version = "0.31.1" @@ -1256,8 +1278,8 @@ dependencies = [ "ahash", "bytemuck", "document-features", - "egui", - "epaint", + "egui 0.31.1", + "epaint 0.31.1", "log", "profiling", "thiserror 1.0.69", @@ -1276,7 +1298,7 @@ dependencies = [ "ahash", "arboard", "bytemuck", - "egui", + "egui 0.31.1", "log", "profiling", "raw-window-handle", @@ -1293,14 +1315,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624659a2e972a46f4d5f646557906c55f1cd5a0836eddbe610fdf1afba1b4226" dependencies = [ "ahash", - "egui", + "egui 0.31.1", "enum-map", "log", - "mime_guess2", "profiling", "serde", ] +[[package]] +name = "egui_extras" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae8f23013328beb6be7ab29c75807142e8e1c7951643780a813e54cceaa9929" +dependencies = [ + "ahash", + "egui 0.32.1", + "enum-map", + "log", + "mime_guess2", + "profiling", +] + [[package]] name = "egui_glow" version = "0.31.1" @@ -1308,7 +1343,7 @@ source = "git+https://github.com/BloodStainedCrow/egui?branch=removeProfiling#4e dependencies = [ "ahash", "bytemuck", - "egui", + "egui 0.31.1", "glow", "log", "memoffset", @@ -1320,11 +1355,13 @@ dependencies = [ [[package]] name = "egui_graphs" -version = "0.25.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4779b6849bda09572523f4dedbfbf80179253f801f4eb1aaa0ef231894634ba6" +checksum = "3f1a4f357adce91fb5fa51edb89d7ea81dd18a2e9a66f01ece7298b1b13eea8d" dependencies = [ - "egui", + "egui 0.32.1", + "getrandom 0.2.16", + "instant", "petgraph", "rand 0.9.2", "serde", @@ -1332,13 +1369,13 @@ dependencies = [ [[package]] name = "egui_plot" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ae092b46ea532f6c69d3e71036fb3b688fd00fd09c2a1e43d17051a8ae43e6" +checksum = "524318041a8ea90c81c738e8985f8ad9e3f9bed636b03c2ff37b218113ed5121" dependencies = [ "ahash", - "egui", - "emath 0.31.1 (registry+https://github.com/rust-lang/crates.io-index)", + "egui 0.32.1", + "emath 0.32.1", ] [[package]] @@ -1350,15 +1387,18 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "emath" version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e4cadcff7a5353ba72b7fea76bf2122b5ebdbc68e8155aa56dfdea90083fe1b" +source = "git+https://github.com/BloodStainedCrow/egui?branch=removeProfiling#4e11a02615078f509d9acc474ae13a66b411eaf7" +dependencies = [ + "bytemuck", + "serde", +] [[package]] name = "emath" -version = "0.31.1" -source = "git+https://github.com/BloodStainedCrow/egui?branch=removeProfiling#4e11a02615078f509d9acc474ae13a66b411eaf7" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "935df67dc48fdeef132f2f7ada156ddc79e021344dd42c17f066b956bb88dde3" dependencies = [ - "bytemuck", "serde", ] @@ -1441,8 +1481,8 @@ dependencies = [ "ab_glyph", "ahash", "bytemuck", - "ecolor", - "emath 0.31.1 (git+https://github.com/BloodStainedCrow/egui?branch=removeProfiling)", + "ecolor 0.31.1", + "emath 0.31.1", "epaint_default_fonts", "log", "nohash-hasher", @@ -1451,6 +1491,22 @@ dependencies = [ "serde", ] +[[package]] +name = "epaint" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66fc0a5a9d322917de9bd3ac7d426ca8aa3127fbf1e76fae5b6b25e051e06a3" +dependencies = [ + "ab_glyph", + "ahash", + "ecolor 0.32.1", + "emath 0.32.1", + "nohash-hasher", + "parking_lot", + "profiling", + "serde", +] + [[package]] name = "epaint_default_fonts" version = "0.31.1" @@ -1554,8 +1610,8 @@ dependencies = [ "dhat", "directories", "eframe", - "egui", - "egui_extras", + "egui 0.31.1", + "egui_extras 0.32.1", "egui_graphs", "egui_plot", "enum-map", @@ -1573,10 +1629,10 @@ dependencies = [ "proptest", "puffin", "puffin_egui", - "rand 0.8.5", + "rand 0.9.2", "rayon", "rfd", - "ron 0.8.1", + "ron", "rstest", "serde", "serde_path_to_error", @@ -1844,8 +1900,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.1+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2262,6 +2320,15 @@ dependencies = [ "serde", ] +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + [[package]] name = "interpolate_name" version = "0.2.4" @@ -3343,9 +3410,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "postcard" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c1de96e20f51df24ca73cafcc4690e044854d803259db27a00a461cb3b9d17a" +checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -3495,8 +3562,8 @@ name = "puffin_egui" version = "0.29.1" source = "git+https://github.com/BloodStainedCrow/puffin#a3f7ff67ec940258ca010609b256d4126e560002" dependencies = [ - "egui", - "egui_extras", + "egui 0.31.1", + "egui_extras 0.31.1", "indexmap", "natord", "once_cell", @@ -3709,9 +3776,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -3719,9 +3786,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3844,25 +3911,13 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.9.1", - "serde", - "serde_derive", -] - [[package]] name = "ron" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f" dependencies = [ - "base64 0.22.1", + "base64", "bitflags 2.9.1", "serde", "serde_derive", @@ -3877,21 +3932,20 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rstest" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fc39292f8613e913f7df8fa892b8944ceb47c247b78e1b1ae2f09e019be789d" +checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49" dependencies = [ "futures-timer", "futures-util", "rstest_macros", - "rustc_version", ] [[package]] name = "rstest_macros" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f168d99749d307be9de54d23fd226628d99768225ef08f6ffb52e0182a27746" +checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0" dependencies = [ "cfg-if", "glob", @@ -4536,7 +4590,7 @@ version = "0.1.0" source = "git+https://github.com/BloodStainedCrow/tilelib.git#aa44854b8b9c571894a4a83b3ff65aecb6f78614" dependencies = [ "bytemuck", - "egui", + "egui 0.31.1", "egui-wgpu", "image", "itertools 0.14.0", @@ -4827,7 +4881,7 @@ version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" dependencies = [ - "base64 0.22.1", + "base64", "data-url", "flate2", "fontdb", @@ -5791,9 +5845,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winit" -version = "0.30.11" +version = "0.30.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4409c10174df8779dc29a4788cac85ed84024ccbc1743b776b21a520ee1aaf4" +checksum = "c66d4b9ed69c4009f6321f762d6e61ad8a2389cd431b97cb1e146812e9e6c732" dependencies = [ "ahash", "android-activity", diff --git a/Cargo.toml b/Cargo.toml index 7d1c407..c1ed187 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,16 +8,16 @@ rust-version = "1.85" [dependencies] enum-map = { version = "2.7.3", features = ["serde"] } proptest = "1.4.0" -winit = "0.30.8" +winit = "0.30.12" tilelib = { git = "https://github.com/BloodStainedCrow/tilelib.git" } spin_sleep_util = "0.1.1" image = "0.25.5" log = "0.4.25" simple_logger = "5.0.0" -rayon = "1.10.0" +rayon = "1.11.0" serde = { version = "1.0.217", features = ["derive"] } directories = "6.0.0" -ron = "0.8.1" +ron = "0.10.1" take_mut = "0.2.2" static_assertions = "1.1.0" itertools = "0.14.0" @@ -25,19 +25,19 @@ genawaiter = "0.99.1" petgraph = { version = "0.8.2", features = ["rayon", "serde", "serde-1", "serde_derive"] } sha2 = "0.10.8" hex = "0.4.3" -postcard = { version = "1.1.1", features = ["use-std"] } +postcard = { version = "1.1.3", features = ["use-std"] } charts-rs = { version = "0.3.20", features = ["resvg"] } strum = { version = "0.27.1", features = ["derive"] } bitvec = "1.0.1" bimap = { version = "0.6.3", features = ["serde"] } eframe = { version = "0.31.1", features = ["wgpu"] } -egui_extras = "0.31.1" -egui_plot = "0.32.1" -rand = "0.8.5" -bitcode = { version = "0.6.6", features = ["serde"] } +egui_extras = "0.32.1" +egui_plot = "0.33.0" +rand = "0.9.2" +bitcode = { version = "0.6.7", features = ["serde"] } egui = { version = "0.31.1", features = ["serde"] } flate2 = {version = "1.1.1", features = ["zlib-rs"]} -rstest = "0.25.0" +rstest = "0.26.1" parking_lot = { version = "0.12.3", features = ["serde"] } profiling = { version = "1.0.16" } puffin_egui = "0.29" @@ -45,7 +45,7 @@ puffin = "0.19" dhat = "0.3.3" noise = { version = "0.9.0", features = ["std"] } rfd = "0.15.3" -egui_graphs = "0.25.1" +egui_graphs = "0.28.0" serde_path_to_error = "0.1.17" [patch.crates-io]