Update dependencies

Author: HactarCE

Cargo.lock

@@ -15,7 +15,7 @@ workspace = true
 
 [dependencies]
 approx = "0.5.1"
-ball-tree = "0.4.0"
+ball-tree = "0.5.1"
 bitflags = "2.4.2"
 bitvec = { version = "1.0.1", default-features = false, features = ["alloc"] }
 bytemuck = { version = "1.13.1", optional = true }
@@ -26,7 +26,7 @@ num-traits = "0.2.16"
 parking_lot = "0.12.1"
 serde = { version = "1.0.176", features = ["derive"], optional = true }
 smallvec = { version = "1.11.0", features = ["const_new", "union"] }
-tinyset = "0.4.15"
+tinyset = "0.5.1"
 
 [features]
 serde = ["dep:serde", "smallvec/serde"]

hypermath/Cargo.toml

@@ -31,12 +31,9 @@ mlua = { version = "0.10.0", features = ["lua54", "send", "vendored"] }
 serde = { version = "1.0.176", features = ["derive"] }
 smallvec = { version = "1.11.0", features = ["const_new", "union"] }
 strum = { version = "0.26.3", features = ["derive"] }
-thiserror = "1.0.58"
-tinyset = "0.4.15"
+thiserror = "2.0.3"
+tinyset = "0.5.1"
 walkdir = "2.4.0"
 
 hypermath = { path = "../hypermath" }
 hypershape = { path = "../hypershape" }
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm_thread = "0.2.0"

hyperpuzzle/Cargo.toml

@@ -23,10 +23,10 @@ rayon = "1.7.0"
 slab = "0.4.8"
 smallvec = { version = "1.9.0", features = ["const_new", "union"] }
 serde = { version = "1.0.176", features = ["derive"], optional = true }
-thiserror = "1.0.44"
-tinyset = "0.4.15"
+thiserror = "2.0.3"
+tinyset = "0.5.1"
 tracing = { version = "0.1.37" }
-tracing-log = { version = "0.1.3" }
+tracing-log = { version = "0.2.0" }
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "fmt", "ansi", "json", "registry"] }
 
 hypermath = { path = "../hypermath" }

hypershape/Cargo.toml

@@ -19,75 +19,75 @@ bitvec = { version = "1.0.1", default-features = false, features = ["alloc"] }
 bytemuck = { version = "1.9.1", features = ["derive"] }
 cgmath = "0.18.0"
 colorous = "1.0.10"
-comrak = "0.26.0"
-config = { version = "0.13.1", features = ["preserve_order"] }
+comrak = "0.29.0"
+config = { version = "0.14.1", features = ["preserve_order"] }
 # Fork of color-eyre that does not re-export color_owo, which otherwise clogs editor completions
 color-eyre = { git = "https://github.com/FlareFlo/color-eyre.git", rev = "3bc103d5ffd7e26a71a6894579ef721e7b6c3ce1", default-features = false, features = ["track-caller", "capture-spantrace"] }
 empfindung = "0.2.6"
 eyre = "0.6"
-directories = "4.0.1"
-env_logger = "0.10.0"
+directories = "5.0.1"
+env_logger = "0.11.5"
 float-ord = "0.3.2"
 getrandom = { version = "*", features = ["js"] } # TODO: prefer `rand` crate
-image = "0.24.9"
+image = "0.25.5"
 include_dir = "0.7.4"
 indexmap = { version = "2.4.0", features = ["serde"] } # must match serde_yml
-instant = "0.1.12"
+instant = "0.1.13"
 itertools = "0.13.0"
 key-names = { git = "https://github.com/HactarCE/key-names.git", tag = "v1.5.1", features = ["winit"] }
 lazy_static = "1.5.0"
 log = "0.4.17"
 monostate = "0.1.1"
 names = { version = "0.14.0", default-features = false }
-num_enum = "0.5.7"
+num_enum = "0.7.3"
 oklab = "1.0.1"
 once_cell = "1.9.0"
 opener = "0.7.0"
 optick = { version = "1.3.4", optional = true }
 optick-attr = { version = "0.3.0", optional = true }
 parking_lot = "0.12.1"
 png = "0.17.5"
-pollster = "0.2.5"
+pollster = "0.4.0"
 rand = "*"
 regex = "1.6.0"
-rfd = "0.10.0"
+rfd = "0.15.0"
 rgb_crate = { package = "rgb", version = "*" } # as required by empfindung
 send_wrapper = "0.6"
 serde = { version = "1.0.144", features = ["derive"] }
-serde_yml = "0.0.10"
+serde_yml = "0.0.12"
 smallvec = { version = "1.8.0", features = ["serde", "union"] }
 strum = { version = "0.26.3", features = ["derive"] }
 sublime_fuzzy = "0.7.0"
-thiserror = "1.0.44"
+thiserror = "2.0.3"
 time = { version = "0.3.7", features = ["local-offset"] }
 
 hypermath = { path = "../hypermath" }
 hyperpuzzle = { path = "../hyperpuzzle" }
 hypershape = { path = "../hypershape" }
 
-# Windowing and UI (versions must match)
-eframe = { version = "0.28.1", default-features = false, features = ["accesskit", "default_fonts", "wayland", "web_screen_reader", "wgpu", "x11"] }
-egui = "0.28.1"
-egui_dock = "0.13.0"
-egui_extras = { version = "0.28.1", features = ["svg"] }
-winit = { version = "0.29", features = ["serde"] } # must match eframe
-wgpu = { version = "0.20.1", features = ["webgl"] } # must match eframe
+# Windowing and UI (versions must match; generally limited by egui_dock)
+eframe = { version = "0.29.1", default-features = false, features = ["accesskit", "default_fonts", "wayland", "web_screen_reader", "wgpu", "x11"] }
+egui = "0.29.1"
+egui_dock = "0.14.0"
+egui_extras = { version = "0.29.1", features = ["svg"] }
+winit = { version = "0.30.5", features = ["serde"] } # must match eframe
+wgpu = { version = "22.0.0", features = ["webgl"] } # must match eframe
 
 # native:
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-human-panic = "1.0"
+human-panic = "2.0.2"
 tracing-subscriber = "0.3"
 
 # web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_error_panic_hook = "0.1.6"
-egui-winit = { version = "0.27.2", default-features = false, features = ["links"] }
-js-sys = "=0.3.69"
+egui-winit = { version = "0.29.1", default-features = false, features = ["links"] }
+js-sys = "=0.3.72"
 tracing-wasm = "0.2"
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 wasm-logger = "0.2"
-web-sys = { version = "=0.3.69", features = [
+web-sys = { version = "=0.3.72", features = [
     "CanvasRenderingContext2d",
     "Clipboard",
     "ClipboardEvent",

hyperspeedcube/Cargo.toml

@@ -155,18 +155,18 @@ pub(in crate::gfx) trait BindGroupsTrait<'a>: Sized {
     }
 }
 
-pub(in crate::gfx) trait WgpuPassExt<'pass> {
-    fn set_bind_groups<'a: 'pass>(&mut self, bind_groups: &'a BindGroups);
+pub(in crate::gfx) trait WgpuPassExt {
+    fn set_bind_groups(&mut self, bind_groups: &BindGroups);
 }
-impl<'pass> WgpuPassExt<'pass> for wgpu::RenderPass<'pass> {
-    fn set_bind_groups<'a: 'pass>(&mut self, bind_groups: &'a BindGroups) {
+impl WgpuPassExt for wgpu::RenderPass<'_> {
+    fn set_bind_groups(&mut self, bind_groups: &BindGroups) {
         for (i, bind_group) in bind_groups.bind_groups.iter().enumerate() {
             self.set_bind_group(i as u32, &bind_group.base, &bind_group.offsets);
         }
     }
 }
-impl<'pass> WgpuPassExt<'pass> for wgpu::ComputePass<'pass> {
-    fn set_bind_groups<'a: 'pass>(&mut self, bind_groups: &'a BindGroups) {
+impl WgpuPassExt for wgpu::ComputePass<'_> {
+    fn set_bind_groups(&mut self, bind_groups: &BindGroups) {
         for (i, bind_group) in bind_groups.bind_groups.iter().enumerate() {
             self.set_bind_group(i as u32, &bind_group.base, &bind_group.offsets);
         }

hyperspeedcube/src/gfx/bindings.rs

@@ -168,6 +168,7 @@ impl RenderPipelineDescriptor<'_> {
                 targets: &[self.fragment_target],
             }),
             multiview: None,
+            cache: None,
         })
     }
 }
@@ -189,6 +190,7 @@ impl ComputePipelineDescriptor<'_> {
             module: shader_module,
             entry_point: self.entry_point,
             compilation_options: wgpu::PipelineCompilationOptions::default(),
+            cache: None,
         })
     }
 }

hyperspeedcube/src/gfx/pipelines/mod.rs

@@ -108,11 +108,11 @@ impl eframe::egui_wgpu::CallbackTrait for PuzzleRenderResources {
         vec![]
     }
 
-    fn paint<'a>(
-        &'a self,
+    fn paint(
+        &self,
         _info: egui::PaintCallbackInfo,
-        render_pass: &mut wgpu::RenderPass<'a>,
-        callback_resources: &'a eframe::egui_wgpu::CallbackResources,
+        render_pass: &mut wgpu::RenderPass<'static>,
+        callback_resources: &eframe::egui_wgpu::CallbackResources,
     ) {
         let Some(bind_groups) = callback_resources
             .get::<HashMap<usize, BindGroups>>()

hyperspeedcube/src/gfx/puzzle.rs

@@ -19,6 +19,6 @@ indexmap = "2.4.0"
 itertools = "0.13.0"
 kdl = "4.6.0"
 lazy_static = "1.5.0"
-owo-colors = "3.5.0"
+owo-colors = "4.1.0"
 regex = "1.10.6"
 unindent = "0.2.3"