replace thiserror-no-std with thiserror (#12432)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Steven
2024-11-29 03:41:39 -06:00
committed by GitHub
parent 88bde87f70
commit 37dca23402
6 changed files with 51 additions and 73 deletions

112
Cargo.lock generated
View File

@ -2624,7 +2624,7 @@ dependencies = [
"revm", "revm",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
"walkdir", "walkdir",
] ]
@ -2780,7 +2780,7 @@ dependencies = [
"reth-node-ethereum", "reth-node-ethereum",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
] ]
[[package]] [[package]]
@ -2868,7 +2868,7 @@ dependencies = [
"reth-tracing", "reth-tracing",
"reth-trie-db", "reth-trie-db",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
] ]
@ -6502,7 +6502,7 @@ dependencies = [
"reth-tokio-util", "reth-tokio-util",
"reth-tracing", "reth-tracing",
"schnellru", "schnellru",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing", "tracing",
@ -6538,7 +6538,7 @@ dependencies = [
"reth-rpc-types-compat", "reth-rpc-types-compat",
"reth-tracing", "reth-tracing",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tower 0.4.13", "tower 0.4.13",
"tracing", "tracing",
@ -6592,7 +6592,7 @@ dependencies = [
"reth-execution-errors", "reth-execution-errors",
"reth-primitives", "reth-primitives",
"reth-storage-errors", "reth-storage-errors",
"thiserror 1.0.69", "thiserror 2.0.3",
] ]
[[package]] [[package]]
@ -6748,7 +6748,7 @@ dependencies = [
"reth-fs-util", "reth-fs-util",
"secp256k1", "secp256k1",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
"tikv-jemallocator", "tikv-jemallocator",
"tracy-client", "tracy-client",
] ]
@ -6893,7 +6893,7 @@ dependencies = [
"sysinfo", "sysinfo",
"tempfile", "tempfile",
"test-fuzz", "test-fuzz",
"thiserror 1.0.69", "thiserror 2.0.3",
] ]
[[package]] [[package]]
@ -6949,7 +6949,7 @@ dependencies = [
"reth-trie-db", "reth-trie-db",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
"tracing", "tracing",
] ]
@ -6991,7 +6991,7 @@ dependencies = [
"schnellru", "schnellru",
"secp256k1", "secp256k1",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing", "tracing",
@ -7016,7 +7016,7 @@ dependencies = [
"reth-network-peers", "reth-network-peers",
"reth-tracing", "reth-tracing",
"secp256k1", "secp256k1",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -7042,7 +7042,7 @@ dependencies = [
"secp256k1", "secp256k1",
"serde", "serde",
"serde_with", "serde_with",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing", "tracing",
@ -7081,7 +7081,7 @@ dependencies = [
"reth-testing-utils", "reth-testing-utils",
"reth-tracing", "reth-tracing",
"tempfile", "tempfile",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
@ -7158,7 +7158,7 @@ dependencies = [
"secp256k1", "secp256k1",
"sha2 0.10.8", "sha2 0.10.8",
"sha3", "sha3",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
@ -7213,7 +7213,7 @@ dependencies = [
"reth-primitives-traits", "reth-primitives-traits",
"reth-trie", "reth-trie",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
] ]
@ -7240,7 +7240,7 @@ dependencies = [
"reth-prune", "reth-prune",
"reth-stages-api", "reth-stages-api",
"reth-tasks", "reth-tasks",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
] ]
@ -7295,7 +7295,7 @@ dependencies = [
"reth-trie-parallel", "reth-trie-parallel",
"reth-trie-sparse", "reth-trie-sparse",
"revm-primitives", "revm-primitives",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -7340,7 +7340,7 @@ dependencies = [
"reth-execution-errors", "reth-execution-errors",
"reth-fs-util", "reth-fs-util",
"reth-storage-errors", "reth-storage-errors",
"thiserror 1.0.69", "thiserror 2.0.3",
] ]
[[package]] [[package]]
@ -7373,7 +7373,7 @@ dependencies = [
"serde", "serde",
"snap", "snap",
"test-fuzz", "test-fuzz",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
@ -7401,7 +7401,7 @@ dependencies = [
"reth-primitives", "reth-primitives",
"reth-primitives-traits", "reth-primitives-traits",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
] ]
[[package]] [[package]]
@ -7467,7 +7467,7 @@ dependencies = [
"proptest-derive", "proptest-derive",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"serde", "serde",
"thiserror-no-std", "thiserror 2.0.3",
] ]
[[package]] [[package]]
@ -7664,7 +7664,7 @@ dependencies = [
"reth-transaction-pool", "reth-transaction-pool",
"reth-trie-db", "reth-trie-db",
"tempfile", "tempfile",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
] ]
@ -7691,7 +7691,7 @@ version = "1.1.2"
dependencies = [ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
] ]
[[package]] [[package]]
@ -7734,7 +7734,7 @@ dependencies = [
"rand 0.8.5", "rand 0.8.5",
"reth-tracing", "reth-tracing",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
@ -7759,7 +7759,7 @@ dependencies = [
"reth-mdbx-sys", "reth-mdbx-sys",
"smallvec", "smallvec",
"tempfile", "tempfile",
"thiserror 1.0.69", "thiserror 2.0.3",
"tracing", "tracing",
] ]
@ -7798,7 +7798,7 @@ dependencies = [
"reqwest", "reqwest",
"reth-tracing", "reth-tracing",
"serde_with", "serde_with",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -7858,7 +7858,7 @@ dependencies = [
"serial_test", "serial_test",
"smallvec", "smallvec",
"tempfile", "tempfile",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
@ -7883,7 +7883,7 @@ dependencies = [
"reth-network-types", "reth-network-types",
"reth-tokio-util", "reth-tokio-util",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
] ]
@ -7921,7 +7921,7 @@ dependencies = [
"secp256k1", "secp256k1",
"serde_json", "serde_json",
"serde_with", "serde_with",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"url", "url",
] ]
@ -7952,7 +7952,7 @@ dependencies = [
"reth-fs-util", "reth-fs-util",
"serde", "serde",
"tempfile", "tempfile",
"thiserror 1.0.69", "thiserror 2.0.3",
"tracing", "tracing",
"zstd", "zstd",
] ]
@ -8087,7 +8087,7 @@ dependencies = [
"serde", "serde",
"shellexpand", "shellexpand",
"strum", "strum",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"toml", "toml",
"tracing", "tracing",
@ -8414,7 +8414,7 @@ dependencies = [
"reth-trie", "reth-trie",
"revm", "revm",
"sha2 0.10.8", "sha2 0.10.8",
"thiserror 1.0.69", "thiserror 2.0.3",
"tracing", "tracing",
] ]
@ -8477,7 +8477,7 @@ dependencies = [
"reth-transaction-pool", "reth-transaction-pool",
"revm", "revm",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -8542,7 +8542,7 @@ dependencies = [
"reth-primitives", "reth-primitives",
"revm-primitives", "revm-primitives",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
] ]
@ -8717,7 +8717,7 @@ dependencies = [
"reth-tokio-util", "reth-tokio-util",
"reth-tracing", "reth-tracing",
"rustc-hash 2.0.0", "rustc-hash 2.0.0",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -8738,7 +8738,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"test-fuzz", "test-fuzz",
"thiserror 1.0.69", "thiserror 2.0.3",
"toml", "toml",
] ]
@ -8825,7 +8825,7 @@ dependencies = [
"revm-primitives", "revm-primitives",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tower 0.4.13", "tower 0.4.13",
@ -8919,7 +8919,7 @@ dependencies = [
"reth-transaction-pool", "reth-transaction-pool",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-util", "tokio-util",
"tower 0.4.13", "tower 0.4.13",
@ -8960,7 +8960,7 @@ dependencies = [
"reth-tokio-util", "reth-tokio-util",
"reth-transaction-pool", "reth-transaction-pool",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -9044,7 +9044,7 @@ dependencies = [
"schnellru", "schnellru",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing", "tracing",
@ -9146,7 +9146,7 @@ dependencies = [
"reth-trie", "reth-trie",
"reth-trie-db", "reth-trie-db",
"tempfile", "tempfile",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -9173,7 +9173,7 @@ dependencies = [
"reth-static-file-types", "reth-static-file-types",
"reth-testing-utils", "reth-testing-utils",
"reth-tokio-util", "reth-tokio-util",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing", "tracing",
@ -9277,7 +9277,7 @@ dependencies = [
"pin-project", "pin-project",
"rayon", "rayon",
"reth-metrics", "reth-metrics",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
"tracing-futures", "tracing-futures",
@ -9361,7 +9361,7 @@ dependencies = [
"serde_json", "serde_json",
"smallvec", "smallvec",
"tempfile", "tempfile",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tracing", "tracing",
@ -9473,7 +9473,7 @@ dependencies = [
"reth-trie", "reth-trie",
"reth-trie-common", "reth-trie-common",
"reth-trie-db", "reth-trie-db",
"thiserror 1.0.69", "thiserror 2.0.3",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -9498,7 +9498,7 @@ dependencies = [
"reth-trie", "reth-trie",
"reth-trie-common", "reth-trie-common",
"smallvec", "smallvec",
"thiserror 1.0.69", "thiserror 2.0.3",
] ]
[[package]] [[package]]
@ -10762,26 +10762,6 @@ dependencies = [
"syn 2.0.89", "syn 2.0.89",
] ]
[[package]]
name = "thiserror-impl-no-std"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "thiserror-no-std"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea"
dependencies = [
"thiserror-impl-no-std",
]
[[package]] [[package]]
name = "thread_local" name = "thread_local"
version = "1.1.8" version = "1.1.8"

View File

@ -523,8 +523,7 @@ shellexpand = "3.0.0"
smallvec = "1" smallvec = "1"
strum = { version = "0.26", default-features = false } strum = { version = "0.26", default-features = false }
syn = "2.0" syn = "2.0"
thiserror = "1.0" thiserror = { version = "2.0.0", default-features = false }
thiserror-no-std = { version = "2.0.2", default-features = false }
tracing = "0.1.0" tracing = "0.1.0"
tracing-appender = "0.2" tracing-appender = "0.2"
url = "2.3" url = "2.3"

View File

@ -23,7 +23,7 @@ crc = "3"
# misc # misc
serde = { workspace = true, features = ["derive"], optional = true } serde = { workspace = true, features = ["derive"], optional = true }
thiserror-no-std = { workspace = true, default-features = false } thiserror.workspace = true
dyn-clone.workspace = true dyn-clone.workspace = true
rustc-hash = { workspace = true, optional = true } rustc-hash = { workspace = true, optional = true }
@ -56,7 +56,7 @@ serde = [
std = [ std = [
"alloy-chains/std", "alloy-chains/std",
"alloy-primitives/std", "alloy-primitives/std",
"thiserror-no-std/std", "thiserror/std",
"rustc-hash/std", "rustc-hash/std",
"alloy-consensus/std", "alloy-consensus/std",
"once_cell/std", "once_cell/std",

View File

@ -176,7 +176,7 @@ impl From<EnrForkIdEntry> for ForkId {
} }
/// Reason for rejecting provided `ForkId`. /// Reason for rejecting provided `ForkId`.
#[derive(Clone, Copy, Debug, thiserror_no_std::Error, PartialEq, Eq, Hash)] #[derive(Clone, Copy, Debug, thiserror::Error, PartialEq, Eq, Hash)]
pub enum ValidationError { pub enum ValidationError {
/// Remote node is outdated and needs a software update. /// Remote node is outdated and needs a software update.
#[error( #[error(

View File

@ -34,7 +34,6 @@ derive_more.workspace = true
rand = { workspace = true, features = ["small_rng"] } rand = { workspace = true, features = ["small_rng"] }
tempfile.workspace = true tempfile.workspace = true
[features] [features]
default = [] default = []
test-utils = [] test-utils = []

View File

@ -90,6 +90,6 @@ pub enum NippyJarError {
InconsistentState, InconsistentState,
/// A specified file is missing. /// A specified file is missing.
#[error("Missing file: {0}.")] #[error("Missing file: {}", .0.display())]
MissingFile(PathBuf), MissingFile(PathBuf),
} }