From 20296e909a88ab1dd9d94b6bd2160ca84c430f5f Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Mon, 26 May 2025 16:10:44 +0200 Subject: [PATCH] misc: streamline thiserror cargo dep As almost every sub crate depends on thiserror, lets upgrade it to a workspace dependency. Signed-off-by: Philipp Schuster On-behalf-of: SAP philipp.schuster@sap.com --- Cargo.lock | 54 +++++++++++++++++----------------- Cargo.toml | 5 +++- api_client/Cargo.toml | 2 +- arch/Cargo.toml | 2 +- block/Cargo.toml | 2 +- devices/Cargo.toml | 2 +- hypervisor/Cargo.toml | 2 +- net_util/Cargo.toml | 2 +- option_parser/Cargo.toml | 2 +- pci/Cargo.toml | 2 +- performance-metrics/Cargo.toml | 2 +- rate_limiter/Cargo.toml | 2 +- test_infra/Cargo.toml | 2 +- tpm/Cargo.toml | 2 +- vhost_user_block/Cargo.toml | 2 +- vhost_user_net/Cargo.toml | 2 +- virtio-devices/Cargo.toml | 2 +- vm-device/Cargo.toml | 2 +- vm-migration/Cargo.toml | 2 +- vmm/Cargo.toml | 2 +- 20 files changed, 49 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c097d6975..c67e44930 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -93,7 +93,7 @@ checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" name = "api_client" version = "0.1.0" dependencies = [ - "thiserror 2.0.6", + "thiserror 2.0.12", "vmm-sys-util", ] @@ -115,7 +115,7 @@ dependencies = [ "linux-loader", "log", "serde", - "thiserror 2.0.6", + "thiserror 2.0.12", "uuid", "vm-fdt", "vm-memory", @@ -328,7 +328,7 @@ dependencies = [ "remain", "serde", "smallvec", - "thiserror 2.0.6", + "thiserror 2.0.12", "uuid", "virtio-bindings", "virtio-queue", @@ -441,7 +441,7 @@ dependencies = [ "serde_json", "signal-hook", "test_infra", - "thiserror 2.0.6", + "thiserror 2.0.12", "tpm", "tracer", "vm-memory", @@ -576,7 +576,7 @@ dependencies = [ "num_enum", "pci", "serde", - "thiserror 2.0.6", + "thiserror 2.0.12", "tpm", "vm-allocator", "vm-device", @@ -991,7 +991,7 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror 2.0.6", + "thiserror 2.0.12", "vfio-ioctls", "vm-memory", "vmm-sys-util", @@ -1025,7 +1025,7 @@ dependencies = [ "open-enum", "range_map_vec", "static_assertions", - "thiserror 2.0.6", + "thiserror 2.0.12", "tracing", "zerocopy 0.8.24", ] @@ -1280,7 +1280,7 @@ checksum = "8c7d94972588d562bd349b916de6a43f2ee268e6e9c91cfb5b30549ed4ea2751" dependencies = [ "libc", "mshv-bindings", - "thiserror 2.0.6", + "thiserror 2.0.12", "vmm-sys-util", ] @@ -1315,7 +1315,7 @@ dependencies = [ "rate_limiter", "serde", "serde_json", - "thiserror 2.0.6", + "thiserror 2.0.12", "virtio-bindings", "virtio-queue", "vm-memory", @@ -1439,7 +1439,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" name = "option_parser" version = "0.1.0" dependencies = [ - "thiserror 2.0.6", + "thiserror 2.0.12", ] [[package]] @@ -1522,7 +1522,7 @@ dependencies = [ "libc", "log", "serde", - "thiserror 2.0.6", + "thiserror 2.0.12", "vfio-bindings", "vfio-ioctls", "vfio_user", @@ -1542,7 +1542,7 @@ dependencies = [ "serde", "serde_json", "test_infra", - "thiserror 2.0.6", + "thiserror 2.0.12", "wait-timeout", ] @@ -1760,7 +1760,7 @@ dependencies = [ "epoll", "libc", "log", - "thiserror 2.0.6", + "thiserror 2.0.12", "vmm-sys-util", ] @@ -1790,7 +1790,7 @@ checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" dependencies = [ "getrandom 0.2.15", "libredox", - "thiserror 2.0.6", + "thiserror 2.0.12", ] [[package]] @@ -2077,7 +2077,7 @@ dependencies = [ "serde", "serde_json", "ssh2", - "thiserror 2.0.6", + "thiserror 2.0.12", "vmm-sys-util", "wait-timeout", ] @@ -2093,11 +2093,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.6" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.6", + "thiserror-impl 2.0.12", ] [[package]] @@ -2113,9 +2113,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.6" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", @@ -2154,7 +2154,7 @@ dependencies = [ "libc", "log", "net_gen", - "thiserror 2.0.6", + "thiserror 2.0.12", "vmm-sys-util", ] @@ -2343,7 +2343,7 @@ dependencies = [ "libc", "log", "option_parser", - "thiserror 2.0.6", + "thiserror 2.0.12", "vhost", "vhost-user-backend", "virtio-bindings", @@ -2363,7 +2363,7 @@ dependencies = [ "log", "net_util", "option_parser", - "thiserror 2.0.6", + "thiserror 2.0.12", "vhost", "vhost-user-backend", "virtio-bindings", @@ -2399,7 +2399,7 @@ dependencies = [ "serde_json", "serde_with", "serial_buffer", - "thiserror 2.0.6", + "thiserror 2.0.12", "vhost", "virtio-bindings", "virtio-queue", @@ -2439,7 +2439,7 @@ dependencies = [ "anyhow", "hypervisor", "serde", - "thiserror 2.0.6", + "thiserror 2.0.12", "vfio-ioctls", "vm-memory", "vmm-sys-util", @@ -2469,7 +2469,7 @@ dependencies = [ "anyhow", "serde", "serde_json", - "thiserror 2.0.6", + "thiserror 2.0.12", "vm-memory", ] @@ -2524,7 +2524,7 @@ dependencies = [ "serde_json", "serial_buffer", "signal-hook", - "thiserror 2.0.6", + "thiserror 2.0.12", "tracer", "uuid", "vfio-ioctls", diff --git a/Cargo.toml b/Cargo.toml index 777e6356f..8f745d71d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ option_parser = { path = "option_parser" } seccompiler = { workspace = true } serde_json = { workspace = true } signal-hook = "0.3.18" -thiserror = "2.0.6" +thiserror = { workspace = true } tpm = { path = "tpm" } tracer = { path = "tracer" } vm-memory = { workspace = true } @@ -128,3 +128,6 @@ igvm_defs = { git = "https://github.com/microsoft/igvm", branch = "main" } # serde crates serde_json = "1.0.120" + +# other crates +thiserror = "2.0.12" diff --git a/api_client/Cargo.toml b/api_client/Cargo.toml index ce306ef53..630f1b4c4 100644 --- a/api_client/Cargo.toml +++ b/api_client/Cargo.toml @@ -5,5 +5,5 @@ name = "api_client" version = "0.1.0" [dependencies] -thiserror = "2.0.6" +thiserror = { workspace = true } vmm-sys-util = { workspace = true } diff --git a/arch/Cargo.toml b/arch/Cargo.toml index 1292c669b..461e26d67 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -18,7 +18,7 @@ libc = "0.2.167" linux-loader = { workspace = true, features = ["bzimage", "elf", "pe"] } log = "0.4.22" serde = { version = "1.0.208", features = ["derive", "rc"] } -thiserror = "2.0.6" +thiserror = { workspace = true } uuid = "1.12.1" vm-memory = { workspace = true, features = ["backend-bitmap", "backend-mmap"] } vm-migration = { path = "../vm-migration" } diff --git a/block/Cargo.toml b/block/Cargo.toml index 55e6d61b9..8ef24e0b3 100644 --- a/block/Cargo.toml +++ b/block/Cargo.toml @@ -17,7 +17,7 @@ log = "0.4.22" remain = "0.2.14" serde = { version = "1.0.208", features = ["derive"] } smallvec = "1.13.2" -thiserror = "2.0.6" +thiserror = { workspace = true } uuid = { version = "1.12.1", features = ["v4"] } virtio-bindings = { workspace = true, features = ["virtio-v5_0_0"] } virtio-queue = { workspace = true } diff --git a/devices/Cargo.toml b/devices/Cargo.toml index ad90ec328..334ec0e31 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -17,7 +17,7 @@ log = "0.4.22" num_enum = "0.7.2" pci = { path = "../pci" } serde = { version = "1.0.208", features = ["derive"] } -thiserror = "2.0.6" +thiserror = { workspace = true } tpm = { path = "../tpm" } vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index bfb669e1f..6c18dd0b2 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -36,7 +36,7 @@ serde_json = { workspace = true } serde_with = { version = "3.9.0", default-features = false, features = [ "macros", ] } -thiserror = "2.0.6" +thiserror = { workspace = true } vfio-ioctls = { workspace = true, default-features = false } vm-memory = { workspace = true, features = [ "backend-atomic", diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index 2294b866b..70c390b87 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -12,7 +12,7 @@ log = "0.4.22" net_gen = { path = "../net_gen" } rate_limiter = { path = "../rate_limiter" } serde = { version = "1.0.208", features = ["derive"] } -thiserror = "2.0.6" +thiserror = { workspace = true } virtio-bindings = { workspace = true } virtio-queue = { workspace = true } vm-memory = { workspace = true, features = [ diff --git a/option_parser/Cargo.toml b/option_parser/Cargo.toml index fc3129a70..2b6d0fe11 100644 --- a/option_parser/Cargo.toml +++ b/option_parser/Cargo.toml @@ -5,4 +5,4 @@ name = "option_parser" version = "0.1.0" [dependencies] -thiserror = "2.0.6" +thiserror = { workspace = true } diff --git a/pci/Cargo.toml b/pci/Cargo.toml index 35b9e7193..927334087 100644 --- a/pci/Cargo.toml +++ b/pci/Cargo.toml @@ -16,7 +16,7 @@ hypervisor = { path = "../hypervisor" } libc = "0.2.167" log = "0.4.22" serde = { version = "1.0.208", features = ["derive"] } -thiserror = "2.0.6" +thiserror = { workspace = true } vfio-bindings = { workspace = true, features = ["fam-wrappers"] } vfio-ioctls = { workspace = true, default-features = false } vfio_user = { workspace = true } diff --git a/performance-metrics/Cargo.toml b/performance-metrics/Cargo.toml index 46e184814..87dce7862 100644 --- a/performance-metrics/Cargo.toml +++ b/performance-metrics/Cargo.toml @@ -11,5 +11,5 @@ dirs = "6.0.0" serde = { version = "1.0.208", features = ["derive", "rc"] } serde_json = { workspace = true } test_infra = { path = "../test_infra" } -thiserror = "2.0.6" +thiserror = { workspace = true } wait-timeout = "0.2.0" diff --git a/rate_limiter/Cargo.toml b/rate_limiter/Cargo.toml index dc4a0c7d2..a286b9e20 100644 --- a/rate_limiter/Cargo.toml +++ b/rate_limiter/Cargo.toml @@ -7,5 +7,5 @@ version = "0.1.0" epoll = "4.3.3" libc = "0.2.167" log = "0.4.22" -thiserror = "2.0.6" +thiserror = { workspace = true } vmm-sys-util = { workspace = true } diff --git a/test_infra/Cargo.toml b/test_infra/Cargo.toml index 62bbf7347..e178b6f00 100644 --- a/test_infra/Cargo.toml +++ b/test_infra/Cargo.toml @@ -12,6 +12,6 @@ once_cell = "1.20.2" serde = { version = "1.0.208", features = ["derive", "rc"] } serde_json = { workspace = true } ssh2 = { version = "0.9.4", features = ["vendored-openssl"] } -thiserror = "2.0.6" +thiserror = { workspace = true } vmm-sys-util = { workspace = true } wait-timeout = "0.2.0" diff --git a/tpm/Cargo.toml b/tpm/Cargo.toml index 9c9606ebc..076be121e 100644 --- a/tpm/Cargo.toml +++ b/tpm/Cargo.toml @@ -11,5 +11,5 @@ byteorder = "1.5.0" libc = "0.2.153" log = "0.4.21" net_gen = { path = "../net_gen" } -thiserror = "2.0.6" +thiserror = { workspace = true } vmm-sys-util = { workspace = true } diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index 3f543687d..4c63cfa4d 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -13,7 +13,7 @@ epoll = "4.3.3" libc = "0.2.167" log = "0.4.22" option_parser = { path = "../option_parser" } -thiserror = "2.0.6" +thiserror = { workspace = true } vhost = { workspace = true, features = ["vhost-user-backend"] } vhost-user-backend = { workspace = true } virtio-bindings = { workspace = true } diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index 4b9175667..d36763b79 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -13,7 +13,7 @@ libc = "0.2.167" log = "0.4.22" net_util = { path = "../net_util" } option_parser = { path = "../option_parser" } -thiserror = "2.0.6" +thiserror = { workspace = true } vhost = { workspace = true, features = ["vhost-user-backend"] } vhost-user-backend = { workspace = true } virtio-bindings = { workspace = true } diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index 59d0970aa..fd86b5e3c 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -29,7 +29,7 @@ serde_with = { version = "3.9.0", default-features = false, features = [ "macros", ] } serial_buffer = { path = "../serial_buffer" } -thiserror = "2.0.6" +thiserror = { workspace = true } vhost = { workspace = true, features = [ "vhost-kern", "vhost-user-backend", diff --git a/vm-device/Cargo.toml b/vm-device/Cargo.toml index 0f084b339..cc24dc476 100644 --- a/vm-device/Cargo.toml +++ b/vm-device/Cargo.toml @@ -13,7 +13,7 @@ mshv = ["vfio-ioctls/mshv"] anyhow = "1.0.94" hypervisor = { path = "../hypervisor" } serde = { version = "1.0.208", features = ["derive", "rc"] } -thiserror = "2.0.6" +thiserror = { workspace = true } vfio-ioctls = { workspace = true, default-features = false } vm-memory = { workspace = true, features = ["backend-mmap"] } vmm-sys-util = { workspace = true } diff --git a/vm-migration/Cargo.toml b/vm-migration/Cargo.toml index 0bd6dfa42..5a992c607 100644 --- a/vm-migration/Cargo.toml +++ b/vm-migration/Cargo.toml @@ -8,5 +8,5 @@ version = "0.1.0" anyhow = "1.0.94" serde = { version = "1.0.208", features = ["derive", "rc"] } serde_json = { workspace = true } -thiserror = "2.0.6" +thiserror = { workspace = true } vm-memory = { workspace = true, features = ["backend-atomic", "backend-mmap"] } diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index b6b514830..a6b0314d9 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -66,7 +66,7 @@ serde = { version = "1.0.208", features = ["derive", "rc"] } serde_json = { workspace = true } serial_buffer = { path = "../serial_buffer" } signal-hook = "0.3.18" -thiserror = "2.0.6" +thiserror = { workspace = true } tracer = { path = "../tracer" } uuid = "1.12.1" vfio-ioctls = { workspace = true, default-features = false }