From 0e1e1b004bbc0fca56fbc944c53439f6fe2007d3 Mon Sep 17 00:00:00 2001 From: Jay Oster Date: Mon, 30 Mar 2026 00:11:53 -0700 Subject: [PATCH] Update dependencies - Updated `thiserror` to 2. - Removed local `pixels` dependency in examples. - Updated dependencies for all examples. --- Cargo.lock | 61 +++++++++++++++++++---- Cargo.toml | 2 +- examples/conway/Cargo.toml | 2 +- examples/imgui-winit/Cargo.toml | 4 +- examples/invaders/Cargo.toml | 2 +- examples/minimal-egui/Cargo.toml | 5 +- examples/minimal-winit-android/Cargo.toml | 2 +- examples/tiny-skia-winit/Cargo.toml | 2 +- 8 files changed, 59 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3c24a7..1a2b94d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1720,8 +1720,9 @@ dependencies = [ [[package]] name = "imgui-wgpu" -version = "0.25.0" -source = "git+https://github.com/Yatekii/imgui-wgpu-rs?rev=3db5c5a#3db5c5ad6a63f46428d836e34b1f4557ded0b6b4" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fea1e37b751bba5e320cbf7a323b150b5ac0233982a6059e7e0d457fc3f8570" dependencies = [ "bytemuck", "imgui", @@ -1740,7 +1741,7 @@ dependencies = [ "imgui-wgpu", "imgui-winit-support", "log", - "pixels 0.16.0", + "pixels 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "winit", "winit_input_helper", ] @@ -1798,7 +1799,7 @@ dependencies = [ "getrandom 0.2.17", "gilrs", "log", - "pixels 0.16.0", + "pixels 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "simple-invaders", "winit", "winit_input_helper", @@ -2183,7 +2184,7 @@ dependencies = [ "env_logger 0.11.10", "error-iter", "log", - "pixels 0.16.0", + "pixels 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "winit", "winit_input_helper", ] @@ -2292,7 +2293,7 @@ dependencies = [ "objc2-app-kit", "objc2-foundation 0.2.2", "once_cell", - "png", + "png 0.17.16", "thiserror 1.0.69", "windows-sys 0.59.0", ] @@ -2783,7 +2784,7 @@ dependencies = [ "pixels-mocks", "pollster 0.4.0", "raw-window-handle", - "thiserror 1.0.69", + "thiserror 2.0.18", "ultraviolet", "wgpu", "winit", @@ -2835,6 +2836,19 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "png" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" +dependencies = [ + "bitflags 2.11.0", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + [[package]] name = "polling" version = "3.11.0" @@ -3215,7 +3229,7 @@ dependencies = [ "log", "memmap2", "smithay-client-toolkit", - "tiny-skia", + "tiny-skia 0.11.4", ] [[package]] @@ -3563,8 +3577,22 @@ dependencies = [ "bytemuck", "cfg-if", "log", - "png", - "tiny-skia-path", + "tiny-skia-path 0.11.4", +] + +[[package]] +name = "tiny-skia" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47ffee5eaaf5527f630fb0e356b90ebdec84d5d18d937c5e440350f88c5a91ea" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png 0.18.1", + "tiny-skia-path 0.12.0", ] [[package]] @@ -3578,6 +3606,17 @@ dependencies = [ "strict-num", ] +[[package]] +name = "tiny-skia-path" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca365c3faccca67d06593c5980fa6c57687de727a03131735bb85f01fdeeb9" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + [[package]] name = "tiny-skia-winit" version = "0.1.0" @@ -3586,7 +3625,7 @@ dependencies = [ "error-iter", "log", "pixels 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tiny-skia", + "tiny-skia 0.12.0", "winit", "winit_input_helper", ] diff --git a/Cargo.toml b/Cargo.toml index dc5a3d7..5b5371e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ include = [ [dependencies] bytemuck = "1" raw-window-handle = "0.6" -thiserror = "1" +thiserror = "2" ultraviolet = "0.10" wgpu = "27" diff --git a/examples/conway/Cargo.toml b/examples/conway/Cargo.toml index c1d7ee8..d01faae 100644 --- a/examples/conway/Cargo.toml +++ b/examples/conway/Cargo.toml @@ -12,7 +12,7 @@ default = ["optimize"] [dependencies] byteorder = "1" getrandom = "0.2" -clipline = "0.1.1" +clipline = "0.1" randomize = "3" env_logger.workspace = true diff --git a/examples/imgui-winit/Cargo.toml b/examples/imgui-winit/Cargo.toml index 69a0ee6..2a9478b 100644 --- a/examples/imgui-winit/Cargo.toml +++ b/examples/imgui-winit/Cargo.toml @@ -10,9 +10,8 @@ optimize = ["log/release_max_level_warn"] default = ["optimize"] [dependencies] -pixels = { path = "../.." } imgui = "0.12" -imgui-wgpu = { git = "https://github.com/Yatekii/imgui-wgpu-rs", rev = "3db5c5a" } +imgui-wgpu = "0.26" imgui-winit-support = "0.13" winit = "0.30" winit_input_helper = "0.17" @@ -20,3 +19,4 @@ winit_input_helper = "0.17" env_logger.workspace = true error-iter.workspace = true log.workspace = true +pixels.workspace = true diff --git a/examples/invaders/Cargo.toml b/examples/invaders/Cargo.toml index 66fcbc8..bc3799c 100644 --- a/examples/invaders/Cargo.toml +++ b/examples/invaders/Cargo.toml @@ -14,11 +14,11 @@ byteorder = "1" game-loop = { version = "=1.3.0", features = ["winit"] } getrandom = "0.2" gilrs = "0.10" -pixels = { path = "../.." } simple-invaders = { path = "simple-invaders" } env_logger.workspace = true error-iter.workspace = true log.workspace = true +pixels.workspace = true winit.workspace = true winit_input_helper.workspace = true diff --git a/examples/minimal-egui/Cargo.toml b/examples/minimal-egui/Cargo.toml index d75f45a..aeb9026 100644 --- a/examples/minimal-egui/Cargo.toml +++ b/examples/minimal-egui/Cargo.toml @@ -10,9 +10,8 @@ optimize = ["log/release_max_level_warn"] default = ["optimize"] [dependencies] -pixels = { path = "../.." } egui = "0.33" -egui-wgpu = "0.33.0" +egui-wgpu = "0.33" egui-winit = { version = "0.33", default-features = false, features = ["links"] } winit = "0.30" winit_input_helper = "0.17" @@ -20,4 +19,4 @@ winit_input_helper = "0.17" env_logger.workspace = true error-iter.workspace = true log.workspace = true - +pixels.workspace = true diff --git a/examples/minimal-winit-android/Cargo.toml b/examples/minimal-winit-android/Cargo.toml index a4792ee..ad6a583 100644 --- a/examples/minimal-winit-android/Cargo.toml +++ b/examples/minimal-winit-android/Cargo.toml @@ -14,7 +14,7 @@ winit = { workspace = true, features = ["android-native-activity"] } env_logger.workspace = true [target.'cfg(target_os = "android")'.dependencies] -android_logger = "0.15.0" +android_logger = "0.15" [[bin]] # Rename the bin to avoid https://github.com/rust-lang/cargo/issues/6313 diff --git a/examples/tiny-skia-winit/Cargo.toml b/examples/tiny-skia-winit/Cargo.toml index b749798..61c9577 100644 --- a/examples/tiny-skia-winit/Cargo.toml +++ b/examples/tiny-skia-winit/Cargo.toml @@ -10,7 +10,7 @@ optimize = ["log/release_max_level_warn"] default = ["optimize"] [dependencies] -tiny-skia = "0.11" +tiny-skia = "0.12" env_logger.workspace = true error-iter.workspace = true