diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index bd8a3d864..78a6e5e7d 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -2507,7 +2507,7 @@ dependencies = [ "rstest", "serde", "sha2", - "thiserror 1.0.69", + "thiserror 2.0.9", "tokio", "tokio-listener", "tokio-util", @@ -2609,7 +2609,7 @@ dependencies = [ "serde_json", "sha2", "smol_str", - "thiserror 1.0.69", + "thiserror 2.0.9", "tokio", "tokio-test", "tracing", @@ -5013,7 +5013,7 @@ dependencies = [ "rstest", "serde_json", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "tokio", "tokio-listener", "tonic", @@ -5065,7 +5065,7 @@ dependencies = [ "serde_tagged", "serde_with", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "threadpool", "tokio", "tokio-retry", @@ -5108,7 +5108,7 @@ dependencies = [ "rustc-hash 2.1.0", "rustyline", "smol_str", - "thiserror 1.0.69", + "thiserror 2.0.9", "tokio", "tracing", "tracing-indicatif", @@ -5154,7 +5154,7 @@ dependencies = [ "tabwriter", "tempfile", "test-strategy", - "thiserror 1.0.69", + "thiserror 2.0.9", "toml 0.6.0", "tvix-eval-builtin-macros", "vu128", @@ -5196,7 +5196,7 @@ dependencies = [ "sha1", "sha2", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "tokio", "tokio-tar", "tokio-util", @@ -5261,7 +5261,7 @@ dependencies = [ "sha1", "sha2", "tempfile", - "thiserror 1.0.69", + "thiserror 2.0.9", "tokio", "tokio-listener", "tokio-retry", @@ -5295,7 +5295,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry_sdk", "reqwest-tracing", - "thiserror 1.0.69", + "thiserror 2.0.9", "tokio", "tonic", "tracing", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 1f4ec9891..dc379840f 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -7872,7 +7872,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "tokio"; @@ -8261,7 +8261,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "tokio"; @@ -16506,7 +16506,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "tokio"; @@ -16707,7 +16707,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "threadpool"; @@ -16924,7 +16924,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "tokio"; @@ -17094,7 +17094,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "toml"; @@ -17249,7 +17249,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "tokio"; @@ -17514,7 +17514,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "tokio"; @@ -17696,7 +17696,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 1.0.69"; + packageId = "thiserror 2.0.9"; } { name = "tokio"; diff --git a/tvix/Cargo.toml b/tvix/Cargo.toml index d2340fa9e..540be353b 100644 --- a/tvix/Cargo.toml +++ b/tvix/Cargo.toml @@ -127,7 +127,7 @@ smol_str = "0.2.2" tabwriter = "1.4" tempfile = "3.12.0" test-strategy = "0.2.1" -thiserror = "1.0.63" +thiserror = "2.0" threadpool = "1.8.1" tokio = "1.39.3" tokio-listener = "0.4.3" diff --git a/tvix/eval/src/errors.rs b/tvix/eval/src/errors.rs index 9b5384690..838187a69 100644 --- a/tvix/eval/src/errors.rs +++ b/tvix/eval/src/errors.rs @@ -66,7 +66,8 @@ pub enum ErrorKind { /// Attempted to specify an invalid key type (e.g. integer) in a /// dynamic attribute name. #[error( - "found attribute name '{0}' of type '{}', but attribute names must be strings", + "found attribute name '{}' of type '{}', but attribute names must be strings", + .0, .0.type_of() )] InvalidAttributeName(Value), diff --git a/tvix/store/src/proto/mod.rs b/tvix/store/src/proto/mod.rs index d9edb81f6..2ff4f3e57 100644 --- a/tvix/store/src/proto/mod.rs +++ b/tvix/store/src/proto/mod.rs @@ -44,7 +44,7 @@ pub enum ValidatePathInfoError { InvalidRootNode(DirectoryError), /// Invalid node name encountered. Root nodes in PathInfos have more strict name requirements - #[error("Failed to parse {} as StorePath: {1}", .0.to_str_lossy())] + #[error("Failed to parse {} as StorePath: {}", .0.to_str_lossy(), .1)] InvalidNodeName(Vec, store_path::Error), /// The digest in narinfo.nar_sha256 has an invalid len.