deps: update thiserror to 2.0.18

Update the workspace thiserror dependency to 2.0.18 and
normalize direct workspace crate pins to use the workspace
version.

Fix thiserror 2.x format-string breakage in Dragonball by
replacing mixed positional/implicit arguments in #[error(...)]
attributes with explicit named arguments.

Generated-by: IBM Bob
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2026-06-18 09:03:34 -07:00
parent 93e4b68819
commit 3664990404
17 changed files with 40 additions and 37 deletions

36
Cargo.lock generated
View File

@@ -1158,7 +1158,7 @@ dependencies = [
"resource",
"runtime-spec",
"strum 0.24.1",
"thiserror 1.0.69",
"thiserror 2.0.18",
"tokio",
]
@@ -1564,7 +1564,7 @@ dependencies = [
"lazy_static",
"libc",
"nix 0.31.3",
"thiserror 1.0.69",
"thiserror 2.0.18",
"vm-memory",
"vmm-sys-util 0.15.0",
]
@@ -1573,7 +1573,7 @@ dependencies = [
name = "dbs-allocator"
version = "0.1.1"
dependencies = [
"thiserror 1.0.69",
"thiserror 2.0.18",
]
[[package]]
@@ -1586,7 +1586,7 @@ dependencies = [
"memoffset 0.6.5",
"nix 0.31.3",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"vm-memory",
"vmm-sys-util 0.15.0",
]
@@ -1604,7 +1604,7 @@ dependencies = [
"libc",
"nix 0.31.3",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"vm-fdt",
"vm-memory",
]
@@ -1613,7 +1613,7 @@ dependencies = [
name = "dbs-device"
version = "0.2.0"
dependencies = [
"thiserror 1.0.69",
"thiserror 2.0.18",
]
[[package]]
@@ -1664,7 +1664,7 @@ dependencies = [
"nix 0.31.3",
"serde",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"vfio-bindings",
"vfio-ioctls",
"virtio-queue",
@@ -1678,7 +1678,7 @@ dependencies = [
"dbs-utils",
"dbs-virtio-devices",
"log",
"thiserror 1.0.69",
"thiserror 2.0.18",
"timerfd",
]
@@ -1694,7 +1694,7 @@ dependencies = [
"serde",
"serde_json",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"timerfd",
"vmm-sys-util 0.15.0",
]
@@ -1727,7 +1727,7 @@ dependencies = [
"serde",
"serde_json",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"threadpool",
"timerfd",
"vhost",
@@ -1948,7 +1948,7 @@ dependencies = [
"slog-term",
"tdx",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"tracing",
"vfio-bindings",
"vfio-ioctls",
@@ -3045,7 +3045,7 @@ dependencies = [
"tempfile",
"test-utils",
"tests_utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"tokio",
"tracing",
"ttrpc",
@@ -3632,7 +3632,7 @@ dependencies = [
"strum_macros 0.26.4",
"tempfile",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"tokio",
"tokio-vsock 0.3.4",
"toml",
@@ -3731,7 +3731,7 @@ dependencies = [
"sys-info",
"tempfile",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"tokio",
"toml",
"url",
@@ -3802,7 +3802,7 @@ dependencies = [
"subprocess",
"tempfile",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
]
[[package]]
@@ -3857,7 +3857,7 @@ dependencies = [
"sysinfo",
"tempfile",
"test-utils",
"thiserror 1.0.69",
"thiserror 2.0.18",
"tokio",
"toml",
]
@@ -7397,7 +7397,7 @@ dependencies = [
"slog-scope",
"slog-stdlog",
"tempfile",
"thiserror 1.0.69",
"thiserror 2.0.18",
"tokio",
"unix_socket2",
]
@@ -8932,7 +8932,7 @@ dependencies = [
"opentelemetry 0.17.0",
"serde_json",
"slog",
"thiserror 1.0.69",
"thiserror 2.0.18",
"tokio",
"tokio-vsock 0.3.4",
]

View File

@@ -199,7 +199,7 @@ strum = { version = "0.24.0", features = ["derive"] }
strum_macros = "0.26.2"
tdx = "0.1.1"
tempfile = "3.19.1"
thiserror = "1.0.26"
thiserror = "2.0.18"
tokio = "1.46.1"
tokio-util = "0.7.17"
tokio-vsock = "0.3.4"

View File

@@ -43,7 +43,7 @@ serde_derive = "1.0.27"
serde_json = "1.0.9"
slog = "2.5.2"
slog-scope = "4.4.0"
thiserror = "1"
thiserror = { workspace = true }
tracing = "0.1.41"
vmm-sys-util = { workspace = true }
virtio-queue = { workspace = true, optional = true }

View File

@@ -15,6 +15,6 @@ arc-swap = ">=0.4.8"
libc = "0.2.39"
nix = { workspace = true }
lazy_static = "1"
thiserror = "1"
thiserror = { workspace = true }
vmm-sys-util = { workspace = true }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }

View File

@@ -11,4 +11,4 @@ keywords = ["dragonball"]
readme = "README.md"
[dependencies]
thiserror = "1.0"
thiserror = { workspace = true }

View File

@@ -14,7 +14,7 @@ readme = "README.md"
memoffset = "0.6"
kvm-bindings = { workspace = true, features = ["fam-wrappers"] }
kvm-ioctls = {workspace = true}
thiserror = "1"
thiserror = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = {workspace = true}
libc = ">=0.2.39"

View File

@@ -16,7 +16,7 @@ kvm-bindings = { workspace = true, features = ["fam-wrappers"] }
kvm-ioctls = {workspace = true}
lazy_static = "1"
libc = "0.2.39"
thiserror = "1"
thiserror = { workspace = true }
vm-memory = {workspace = true}
vm-fdt = {workspace= true}

View File

@@ -11,4 +11,4 @@ keywords = ["dragonball", "secure-sandbox", "device", "resource"]
readme = "README.md"
[dependencies]
thiserror = "1"
thiserror = { workspace = true }

View File

@@ -12,7 +12,7 @@ readme = "README.md"
[dependencies]
log = "0.4.14"
thiserror = "1"
thiserror = { workspace = true }
dbs-allocator = { workspace = true }
dbs-boot = { workspace = true }
dbs-device = { workspace = true }

View File

@@ -93,7 +93,7 @@ pub enum Error {
#[error("bar {0} already used")]
BarInUse(usize),
/// PCI BAR is invalid.
#[error("bar {0} invalid, max {}", NUM_BAR_REGS - 1)]
#[error("bar {0} invalid, max {max}", max = NUM_BAR_REGS - 1)]
BarInvalid(usize),
/// PCI BAR size is invalid.
#[error("bar address {0} not a power of two")]
@@ -102,13 +102,16 @@ pub enum Error {
#[error("address {0} size {1} too big")]
BarAddressInvalid(u64, u64),
/// 64 bits MMIO PCI BAR is invalid.
#[error("64 bit bar {0} invalid, requires two regs, max {}", NUM_BAR_REGS - 1)]
#[error(
"64 bit bar {0} invalid, requires two regs, max {max}",
max = NUM_BAR_REGS - 1
)]
BarInvalid64(usize),
/// 64 bits MMIO PCI BAR is in use.
#[error("64bit bar {0} already used(requires two regs)")]
BarInUse64(usize),
/// PCI ROM BAR is invalid.
#[error("ROM bar {0} invalid, max {}", NUM_BAR_REGS - 1)]
#[error("ROM bar {0} invalid, max {max}", max = NUM_BAR_REGS - 1)]
RomBarInvalid(usize),
/// PCI ROM BAR is already in use.
#[error("rom bar {0} already used")]

View File

@@ -12,7 +12,7 @@ readme = "README.md"
[dependencies]
log = "0.4.14"
thiserror = "1"
thiserror = { workspace = true }
timerfd = "1.2.0"
dbs-utils = { workspace = true }

View File

@@ -16,7 +16,7 @@ event-manager = { workspace = true, features = [ "remote_endpoint" ] }
libc = "0.2.39"
log = "0.4.14"
serde = { version = "1.0.27", features = ["derive", "rc"] }
thiserror = "1.0"
thiserror = { workspace = true }
timerfd = "1.0"
vmm-sys-util = {workspace = true}

View File

@@ -36,7 +36,7 @@ nydus-storage = "0.7.2"
rlimit = "0.7.0"
serde = "1.0.27"
serde_json = "1.0.9"
thiserror = "1"
thiserror = { workspace = true }
threadpool = "1"
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }

View File

@@ -59,8 +59,8 @@ pub enum VmConfigError {
/// The hotplug memory size is invalid. The memory can only be an unsigned integer.
#[error(
"the hotplug memory size '{0}' (MiB) is invalid, must be multiple of {}",
MEMORY_HOTPLUG_ALIGHMENT
"the hotplug memory size '{0}' (MiB) is invalid, must be multiple of {alignment}",
alignment = MEMORY_HOTPLUG_ALIGHMENT
)]
InvalidHotplugMemorySize(usize),

View File

@@ -23,7 +23,7 @@ slog = "2.5.2"
slog-scope = "4.4.0"
subprocess = "0.2.8"
rand = { version = "0.10.1", features = ["std", "std_rng", "thread_rng"] }
thiserror = "1.0.30"
thiserror = { workspace = true }
hex = "0.4.3"
pci-ids = "0.2.6"

View File

@@ -23,7 +23,7 @@ serde = { version = "1.0.100", features = ["derive"] }
slog = "2.5.2"
slog-scope = "4.4.0"
serde_json = "1.0.73"
thiserror = "1.0"
thiserror = { workspace = true }
toml = "0.5.8"
serde-enum-str = "0.5"
sysinfo = "0.34.2"

View File

@@ -16,7 +16,7 @@ serde = { workspace = true, features = ["rc", "derive"] }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["sync", "rt"] }
nix = { workspace = true }
thiserror = "2.0.18"
thiserror = { workspace = true }
# Cloud Hypervisor public HTTP API functions
# Note that the version specified is not necessarily the version of CH