From 29b4782015b82f9d31f3fdb13ab3d8c07f84fac3 Mon Sep 17 00:00:00 2001
From: auronandace <auronandace@googlemail.com>
Date: Mon, 23 Mar 2026 07:58:57 +0000
Subject: [PATCH] update thiserror and add to workspace

---
 Cargo.lock                             | 10 +++++-----
 Cargo.toml                             |  1 +
 drivers/acpid/Cargo.toml               |  2 +-
 drivers/storage/usbscsid/Cargo.toml    |  2 +-
 drivers/storage/virtio-blkd/Cargo.toml |  2 +-
 drivers/usb/xhcid/Cargo.toml           |  2 +-
 drivers/virtio-core/Cargo.toml         |  2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7d3aa3eba5..657622ddb9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -51,7 +51,7 @@ dependencies = [
  "ron",
  "rustc-hash",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2391,7 +2391,7 @@ dependencies = [
  "plain",
  "redox_event",
  "redox_syscall 0.7.3",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
  "xhcid",
 ]
 
@@ -2468,7 +2468,7 @@ dependencies = [
  "redox_syscall 0.7.3",
  "spin",
  "static_assertions",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
  "virtio-core",
 ]
 
@@ -2486,7 +2486,7 @@ dependencies = [
  "redox_event",
  "redox_syscall 0.7.3",
  "static_assertions",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2859,7 +2859,7 @@ dependencies = [
  "serde",
  "serde_json",
  "smallvec 1.15.1",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
  "toml",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index a90c4e7851..4093c793d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,6 +102,7 @@ slab = "0.4.9"
 smallvec = "1"
 spin = "0.10"
 static_assertions = "1.1.0"
+thiserror = "2"
 toml = "1"
 
 [workspace.lints.clippy]
diff --git a/drivers/acpid/Cargo.toml b/drivers/acpid/Cargo.toml
index b1dcebafcb..3cdc71fe0e 100644
--- a/drivers/acpid/Cargo.toml
+++ b/drivers/acpid/Cargo.toml
@@ -18,7 +18,7 @@ plain.workspace = true
 redox_syscall.workspace = true
 redox_event.workspace = true
 rustc-hash = "1.1.0"
-thiserror = "1"
+thiserror.workspace = true
 ron.workspace = true
 serde.workspace = true
 
diff --git a/drivers/storage/usbscsid/Cargo.toml b/drivers/storage/usbscsid/Cargo.toml
index 429e6ed52d..4a36934ebb 100644
--- a/drivers/storage/usbscsid/Cargo.toml
+++ b/drivers/storage/usbscsid/Cargo.toml
@@ -16,7 +16,7 @@ driver-block = { path = "../driver-block" }
 daemon = { path = "../../../daemon" }
 redox_event.workspace = true
 redox_syscall = { workspace = true, features = ["std"] }
-thiserror = "1"
+thiserror.workspace = true
 xhcid = { path = "../../usb/xhcid" }
 
 [lints]
diff --git a/drivers/storage/virtio-blkd/Cargo.toml b/drivers/storage/virtio-blkd/Cargo.toml
index 8a3bb9b1a9..cd8fc6d2de 100644
--- a/drivers/storage/virtio-blkd/Cargo.toml
+++ b/drivers/storage/virtio-blkd/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Anhad Singh <andypython@protonmail.com>"]
 [dependencies]
 anyhow.workspace = true
 log.workspace = true
-thiserror = "1.0.40"
+thiserror.workspace = true
 static_assertions.workspace = true
 futures = { version = "0.3.28", features = ["executor"] }
 spin.workspace = true
diff --git a/drivers/usb/xhcid/Cargo.toml b/drivers/usb/xhcid/Cargo.toml
index 18d17f4e01..b111869081 100644
--- a/drivers/usb/xhcid/Cargo.toml
+++ b/drivers/usb/xhcid/Cargo.toml
@@ -26,7 +26,7 @@ redox_syscall.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 smallvec = { workspace = true, features = ["serde"] }
-thiserror = "1"
+thiserror.workspace = true
 toml.workspace = true
 
 common = { path = "../../common" }
diff --git a/drivers/virtio-core/Cargo.toml b/drivers/virtio-core/Cargo.toml
index 5ce6b96c07..0f37be583f 100644
--- a/drivers/virtio-core/Cargo.toml
+++ b/drivers/virtio-core/Cargo.toml
@@ -11,7 +11,7 @@ bitflags.workspace = true
 redox_syscall.workspace = true
 libredox.workspace = true
 log.workspace = true
-thiserror = "1.0.40"
+thiserror.workspace = true
 futures = { version = "0.3.28", features = ["executor"] }
 crossbeam-queue = "0.3.8"