From 615ec470e26492c8c73c356e147ddabba6aa15ce Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Wed, 19 Feb 2025 21:32:01 -0500
Subject: Upgrade to latest thiserror

---
 Cargo.lock  | 30 +++++-------------------------
 Cargo.toml  |  2 +-
 src/name.rs |  2 +-
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dcf39b0..e061bfb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1402,7 +1402,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror",
  "tokio",
  "tokio-stream",
  "unicode-casefold",
@@ -1849,7 +1849,7 @@ dependencies = [
  "serde_json",
  "sha2",
  "smallvec",
- "thiserror 2.0.11",
+ "thiserror",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -1933,7 +1933,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.11",
+ "thiserror",
  "tracing",
  "whoami",
 ]
@@ -1971,7 +1971,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.11",
+ "thiserror",
  "tracing",
  "whoami",
 ]
@@ -2071,33 +2071,13 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[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",
+ "thiserror-impl",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 4f3615b..15c0aa7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ serde_json = "1.0.138"
 # Pinned to maintain libsqlite3 version match between this and rusqlite. See
 # also: <https://docs.rs/sqlx/latest/sqlx/sqlite/index.html>
 sqlx = { version = "=0.8.3", features = ["chrono", "runtime-tokio", "sqlite"] }
-thiserror = "1.0.69"
+thiserror = "2.0.11"
 tokio = { version = "1.43.0", features = ["rt", "macros", "rt-multi-thread"] }
 tokio-stream = { version = "0.1.17", features = ["sync"] }
 unicode-casefold = "0.2.0"
diff --git a/src/name.rs b/src/name.rs
index 9187d33..9861bc1 100644
--- a/src/name.rs
+++ b/src/name.rs
@@ -50,7 +50,7 @@ impl Name {
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("stored canonical form {0:#?} does not match computed canonical form {:#?} for name {:#?}", .1.as_str(), .2.as_str())]
+    #[error("stored canonical form {stored:#?} does not match computed canonical form {computed:#?} for name {expected:#?}", stored=.0, computed=.1.as_str(), expected=.2.as_str())]
     CanonicalMismatch(String, ident::String, nfc::String),
 }
 
-- 
cgit v1.2.3