From 458d712998d57ea4c82fcb9ed99dd4d93b83e33e Mon Sep 17 00:00:00 2001 From: Joseph Livesey Date: Wed, 6 Nov 2024 14:33:30 -0500 Subject: [PATCH] build: upgrade thiserror crate to 2.0.0 --- Cargo.lock | 50 +++++++++++++++++++++++++++++++++++--------------- Cargo.toml | 2 +- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dda55d8d..c98a8484 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2063,7 +2063,7 @@ dependencies = [ "sha3 0.9.1", "ssz_types 0.8.0", "superstruct 0.7.0", - "thiserror", + "thiserror 1.0.68", "tokio", "tree_hash 0.8.0", "tree_hash_derive 0.8.0", @@ -2142,7 +2142,7 @@ dependencies = [ "rustls", "serde", "serde_derive", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-stream", "tonic", @@ -2168,7 +2168,7 @@ dependencies = [ "reth-trie-common", "serde", "serde_json", - "thiserror", + "thiserror 2.0.0", "tokio", "tonic", "tonic-build", @@ -2220,7 +2220,7 @@ dependencies = [ "reth-primitives", "serde", "serde_json", - "thiserror", + "thiserror 2.0.0", "tracing", "tracing-subscriber", "zstd", @@ -2513,7 +2513,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -2637,7 +2637,7 @@ dependencies = [ "serde", "serde_json", "tempfile", - "thiserror", + "thiserror 2.0.0", "tree_hash 0.8.0", "trin-validation", ] @@ -3195,7 +3195,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.68", "walkdir", ] @@ -3258,7 +3258,7 @@ dependencies = [ "rustls-pki-types", "rustls-platform-verifier", "soketto", - "thiserror", + "thiserror 1.0.68", "tokio", "tokio-rustls", "tokio-util", @@ -3286,7 +3286,7 @@ dependencies = [ "rustc-hash 2.0.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", "tokio", "tokio-stream", "tracing", @@ -3311,7 +3311,7 @@ dependencies = [ "rustls-platform-verifier", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", "tokio", "tower 0.4.13", "tracing", @@ -3350,7 +3350,7 @@ dependencies = [ "serde", "serde_json", "soketto", - "thiserror", + "thiserror 1.0.68", "tokio", "tokio-stream", "tokio-util", @@ -3367,7 +3367,7 @@ dependencies = [ "http", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -4086,7 +4086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.68", "ucd-trie", ] @@ -4527,7 +4527,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -5697,7 +5697,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15291287e9bff1bc6f9ff3409ed9af665bec7a5fc8ac079ea96be07bca0e2668" +dependencies = [ + "thiserror-impl 2.0.0", ] [[package]] @@ -5711,6 +5720,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22efd00f33f93fa62848a7cab956c3d38c8d43095efda1decfc2b3a5dc0b8972" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thiserror-impl-no-std" version = "2.0.2" diff --git a/Cargo.toml b/Cargo.toml index 3b851995..197c9bbb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ serde_derive = "1.0.208" serde_json = "1.0.127" ssz_types = "0.6" tempfile = "3.0" -thiserror = "1.0.63" +thiserror = "2.0.0" tokio = "1.39.2" tokio-stream = "0.1.16" tonic = "0.12.0"