Replace thiserror-no-std with thiserror 2

DaniPopes · DaniPopes · commit b66f7c2e953e · 2025-02-18T22:16:15.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 #### Upcoming Changes
 
+* feat: replace `thiserror-no-std` with `thiserror 2` [#1919](https://github.com/lambdaclass/cairo-vm/pull/1919)
+
 * feat: implement `Blake2sLastBlock` opcode in VM [#1932](https://github.com/lambdaclass/cairo-vm/pull/1932)
 
 * feat: implement `Blake2s` opcode in VM [#1927](https://github.com/lambdaclass/cairo-vm/pull/1927)
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,7 +58,7 @@ generic-array = { version = "0.14.7", default-features = false }
 keccak = { version = "0.1.2", default-features = false }
 hashbrown = { version = "0.15.2", features = ["serde"] }
 anyhow = { version = "1.0.94", default-features = false }
-thiserror-no-std = { version = "2.0.2", default-features = false }
+thiserror = { version = "2", default-features = false }
 
 bitvec = { version = "1", default-features = false, features = ["alloc"] }
 
diff --git a/cairo-vm-cli/Cargo.toml b/cairo-vm-cli/Cargo.toml
@@ -13,7 +13,7 @@ cairo-vm-tracer = { workspace = true, optional = true }
 clap = { version = "4.3.10", features = ["derive"] }
 mimalloc = { version = "0.1.37", default-features = false, optional = true }
 nom = "7"
-thiserror = { version = "1.0.40" }
+thiserror = { workspace = true, features = ["std"]}
 bincode.workspace = true
 
 [dev-dependencies]
diff --git a/cairo-vm-tracer/Cargo.toml b/cairo-vm-tracer/Cargo.toml
@@ -13,7 +13,7 @@ alloc = []
 
 [dependencies]
 cairo-vm = { workspace = true, features = ["test_utils"] }
-thiserror-no-std = { workspace = true }
+thiserror = { workspace = true, features = ["std"] }
 num-bigint = { workspace = true }
 num-traits = { workspace = true }
 axum = "0.6.18"
diff --git a/cairo-vm-tracer/src/error/trace_data_errors.rs b/cairo-vm-tracer/src/error/trace_data_errors.rs
@@ -1,5 +1,5 @@
 use cairo_vm::vm::errors::{memory_errors::MemoryError, vm_errors::VirtualMachineError};
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum TraceDataError {
diff --git a/cairo1-run/Cargo.toml b/cairo1-run/Cargo.toml
@@ -23,7 +23,7 @@ cairo-lang-utils.workspace = true
 cairo-lang-casm.workspace = true
 itertools = "0.11.0"
 clap = { version = "4.3.10", features = ["derive"] }
-thiserror = { version = "1.0.40" }
+thiserror = { workspace = true, features = ["std"] }
 bincode.workspace = true
 assert_matches = "1.5.0"
 rstest = "0.17.0"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -17,7 +17,7 @@ std = [
     "starknet-types-core/std",
     "starknet-crypto/std",
     "dep:num-prime",
-    "thiserror-no-std/std",
+    "thiserror/std",
     "dep:zip",
 ]
 cairo-1-hints = [
@@ -58,7 +58,7 @@ generic-array = { workspace = true }
 keccak = { workspace = true }
 hashbrown = { workspace = true }
 anyhow = { workspace = true }
-thiserror-no-std = { workspace = true }
+thiserror = { workspace = true }
 starknet-types-core = { version = "0.1.2", default-features = false, features = ["serde", "curve", "num-traits", "hash"] }
 rust_decimal = { version = "1.35.0", default-features = false }
 
diff --git a/vm/src/air_public_input.rs b/vm/src/air_public_input.rs
@@ -1,6 +1,6 @@
 use crate::Felt252;
 use serde::{Deserialize, Serialize};
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::{
     stdlib::{
diff --git a/vm/src/cairo_run.rs b/vm/src/cairo_run.rs
@@ -16,7 +16,7 @@ use crate::{
 use crate::Felt252;
 use bincode::enc::write::Writer;
 
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::types::exec_scope::ExecutionScopes;
 #[cfg(feature = "test_utils")]
diff --git a/vm/src/program_hash.rs b/vm/src/program_hash.rs
@@ -9,13 +9,13 @@ use crate::vm::runners::cairo_pie::StrippedProgram;
 
 type HashFunction = fn(&Felt252, &Felt252) -> Felt252;
 
-#[derive(thiserror_no_std::Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub enum HashChainError {
     #[error("Data array must contain at least one element.")]
     EmptyData,
 }
 
-#[derive(thiserror_no_std::Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub enum ProgramHashError {
     #[error(transparent)]
     HashChain(#[from] HashChainError),
diff --git a/vm/src/types/errors/math_errors.rs b/vm/src/types/errors/math_errors.rs
@@ -4,7 +4,7 @@
 use crate::stdlib::boxed::Box;
 use crate::Felt252;
 use num_bigint::{BigInt, BigUint};
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::types::relocatable::{MaybeRelocatable, Relocatable};
 
diff --git a/vm/src/types/errors/program_errors.rs b/vm/src/types/errors/program_errors.rs
@@ -1,6 +1,6 @@
 use crate::stdlib::prelude::*;
 use crate::utils::PRIME_STR;
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum ProgramError {
diff --git a/vm/src/vm/errors/cairo_pie_errors.rs b/vm/src/vm/errors/cairo_pie_errors.rs
@@ -1,4 +1,4 @@
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::types::builtin_name::BuiltinName;
 
diff --git a/vm/src/vm/errors/cairo_run_errors.rs b/vm/src/vm/errors/cairo_run_errors.rs
@@ -1,4 +1,4 @@
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use super::cairo_pie_errors::CairoPieValidationError;
 use super::memory_errors::MemoryError;
diff --git a/vm/src/vm/errors/exec_scope_errors.rs b/vm/src/vm/errors/exec_scope_errors.rs
@@ -1,4 +1,4 @@
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 #[derive(Eq, Hash, PartialEq, Debug, Error)]
 pub enum ExecScopeError {
diff --git a/vm/src/vm/errors/hint_errors.rs b/vm/src/vm/errors/hint_errors.rs
@@ -3,7 +3,7 @@
 
 use crate::stdlib::prelude::*;
 
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::Felt252;
 use num_bigint::{BigInt, BigUint};
diff --git a/vm/src/vm/errors/memory_errors.rs b/vm/src/vm/errors/memory_errors.rs
@@ -4,7 +4,7 @@
 use crate::stdlib::prelude::*;
 use crate::types::builtin_name::BuiltinName;
 
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::Felt252;
 
diff --git a/vm/src/vm/errors/runner_errors.rs b/vm/src/vm/errors/runner_errors.rs
@@ -4,7 +4,7 @@
 use crate::stdlib::{collections::HashSet, prelude::*};
 use crate::types::builtin_name::BuiltinName;
 use crate::types::layout_name::LayoutName;
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use super::{memory_errors::MemoryError, trace_errors::TraceError};
 use crate::types::{errors::math_errors::MathError, relocatable::Relocatable};
diff --git a/vm/src/vm/errors/trace_errors.rs b/vm/src/vm/errors/trace_errors.rs
@@ -1,4 +1,4 @@
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::vm::errors::memory_errors::MemoryError;
 
diff --git a/vm/src/vm/errors/vm_errors.rs b/vm/src/vm/errors/vm_errors.rs
@@ -4,7 +4,7 @@
 use crate::stdlib::prelude::*;
 use crate::types::builtin_name::BuiltinName;
 
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::Felt252;
 use crate::{
diff --git a/vm/src/vm/errors/vm_exception.rs b/vm/src/vm/errors/vm_exception.rs
@@ -7,7 +7,7 @@ use crate::{
     types::relocatable::Relocatable,
 };
 
-use thiserror_no_std::Error;
+use thiserror::Error;
 
 use crate::{
     hint_processor::hint_processor_utils::get_maybe_relocatable_from_reference,
