From 43858063cae006a7c106b9659bb5684fd5a0edcc Mon Sep 17 00:00:00 2001
From: Marc Hartmayer <mhartmay@linux.ibm.com>
Date: Fri, 13 Dec 2024 12:56:31 +0100
Subject: [PATCH] rust: Upgrade 'thiserror' to '2.0.6'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since there have been breaking changes, let's fix them. Fortunately,
there was only one problem to fix.

Command line used:

  $ cargo upgrade --incompatible -p 'thiserror'

Acked-by: Jan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 rust/Cargo.lock         | 8 ++++----
 rust/pv/Cargo.toml      | 2 +-
 rust/pv/src/error.rs    | 2 +-
 rust/pv_core/Cargo.toml | 2 +-
 rust/pvimg/Cargo.toml   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index f3396e44..6ca94cd8 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -944,18 +944,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.69"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.69"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/rust/pv/Cargo.toml b/rust/pv/Cargo.toml
index f1eb49cf..faee75b2 100644
--- a/rust/pv/Cargo.toml
+++ b/rust/pv/Cargo.toml
@@ -22,7 +22,7 @@ log = { version = "0.4.22", features = ["std", "release_max_level_debug"] }
 openssl = "0.10.68"
 openssl-sys = "0.9.104"
 serde = { version = "1.0.216", features = ["derive"]  }
-thiserror = "1.0.69"
+thiserror = "2.0.6"
 zerocopy = { version="0.7", features = ["derive"] }
 
 pv_core = { path = "../pv_core", package = "s390_pv_core", version = "0.11.0" }
diff --git a/rust/pv/src/error.rs b/rust/pv/src/error.rs
index 601b40f0..68466448 100644
--- a/rust/pv/src/error.rs
+++ b/rust/pv/src/error.rs
@@ -55,7 +55,7 @@ pub enum Error {
     #[error("Decryption failed. Probably due to a GCM tag mismatch.")]
     GcmTagMismatch,
 
-    #[error("Invalid {0} user-data for signing provided. Max {} bytes allowed", .0.max())]
+    #[error("Invalid {0} user-data for signing provided. Max {max} bytes allowed", max=.0.max())]
     AsrcbInvSgnUserData(UserDataType),
 
     #[error("Unsupported user data signing key provided. Only EC(secp521r1) and RSA(2048 & 3072 bit) are supported")]
diff --git a/rust/pv_core/Cargo.toml b/rust/pv_core/Cargo.toml
index 241d7074..d06aa1ab 100644
--- a/rust/pv_core/Cargo.toml
+++ b/rust/pv_core/Cargo.toml
@@ -18,7 +18,7 @@ workspace = true
 [dependencies]
 libc = "0.2.168"
 log = { version = "0.4.22", features = ["std", "release_max_level_debug"] }
-thiserror = "1.0.69"
+thiserror = "2.0.6"
 zerocopy = {version = "0.7", features = ["derive"]}
 serde = { version = "1.0.216", features = ["derive"]}
 byteorder = "1.5"
diff --git a/rust/pvimg/Cargo.toml b/rust/pvimg/Cargo.toml
index 47087815..9bfc9306 100644
--- a/rust/pvimg/Cargo.toml
+++ b/rust/pvimg/Cargo.toml
@@ -18,7 +18,7 @@ log = { version = "0.4.22", features = ["std", "release_max_level_debug"] }
 openssl = "0.10.68"
 serde = { version = "1.0.216", features = ["derive"]}
 serde_json = "1.0"
-thiserror = "1.0.69"
+thiserror = "2.0.6"
 
 pv = { path = "../pv", package = "s390_pv" }
 utils = { path = "../utils" }