From 11f6a415e228004fd7fbe31af306abdc912593be Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Wed, 15 Jan 2025 14:07:59 -0800 Subject: [PATCH] Deps: Update `thiserror` from 1 to 2. Updating `wgpu` brought in newer `thiserror`, so we have no reason to hold back our own version. --- Cargo.lock | 2 +- Cargo.toml | 2 +- all-is-cubes-wasm/Cargo.lock | 30 +++++------------------------- tools/deny.toml | 1 - 4 files changed, 7 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 378a37a2f..2a8102967 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -274,7 +274,7 @@ dependencies = [ "snapbox", "stl_io", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.11", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index cdd8b88c3..fe8f76d64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -146,7 +146,7 @@ snapbox = "0.6.10" # keep in sync with `trycmd` strum = { version = "0.26.3", default-features = false, features = ["derive"] } sync_wrapper = { version = "1.0.0", default-features = false } tempfile = { version = "3.15.0", default-features = false } -thiserror = { version = "1.0.65", default-features = false } +thiserror = { version = "2.0.11", default-features = false } time = { version = "0.3.36", default-features = false } # Tokio is used for async test-running and for certain binaries. # The library crates do not require Tokio. diff --git a/all-is-cubes-wasm/Cargo.lock b/all-is-cubes-wasm/Cargo.lock index b1fdf6b89..c40e501b4 100644 --- a/all-is-cubes-wasm/Cargo.lock +++ b/all-is-cubes-wasm/Cargo.lock @@ -174,7 +174,7 @@ dependencies = [ "rectangle-pack", "serde_json", "stl_io", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1144,7 +1144,7 @@ dependencies = [ "spirv", "strum", "termcolor", - "thiserror 2.0.11", + "thiserror", "unicode-xid", ] @@ -1668,33 +1668,13 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.11", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.94", + "thiserror-impl", ] [[package]] @@ -1915,7 +1895,7 @@ dependencies = [ "raw-window-handle", "rustc-hash", "smallvec", - "thiserror 2.0.11", + "thiserror", "wgpu-hal", "wgpu-types", ] @@ -1954,7 +1934,7 @@ dependencies = [ "renderdoc-sys", "rustc-hash", "smallvec", - "thiserror 2.0.11", + "thiserror", "wasm-bindgen", "web-sys", "wgpu-types", diff --git a/tools/deny.toml b/tools/deny.toml index b68b4479e..285419be2 100644 --- a/tools/deny.toml +++ b/tools/deny.toml @@ -34,7 +34,6 @@ allow-wildcard-paths = true skip = [ { name = "core-foundation", version = "0.9.4" }, # old used by `winit` - { name = "cfg_aliases" }, # winit and wgpu use different versions { name = "unicode-width", version = "0.1" }, # old used by `codespan-reporting` via `wgpu` ]