chore!: Upgrade to rust edition 2024

BREAKING CHANGE: Bump MSRV to 1.85

Author: jan-ferdinand

Cargo.toml

@@ -4,7 +4,9 @@ resolver = "2"
 
 [workspace.package]
 version = "0.48.0"
-edition = "2021"
+edition = "2024"
+rust-version = "1.85"
+
 authors = ["Triton Software AG"]
 license = "Apache-2.0"
 homepage = "https://triton-vm.org/"
@@ -20,6 +22,3 @@ version = "0.48.0"
 path = "tasm-object-derive"
 
 [workspace.lints.rust]
-edition-2024-expr-fragment-specifier = "allow"  # accept the new `expr` fragment specifier rules
-if-let-rescope = "allow"                        # accept the new `if-let` scope
-rust-2024-compatibility = "warn"

tasm-lib/Cargo.toml

@@ -9,6 +9,7 @@ categories = ["cryptography"]
 
 version.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 authors.workspace = true
 license.workspace = true
 homepage.workspace = true

tasm-lib/src/exported_snippets.rs

@@ -3,25 +3,25 @@ use triton_vm::air::challenge_id::ChallengeId;
 use triton_vm::challenges::Challenges;
 use triton_vm::prelude::Stark;
 use triton_vm::proof_item::ProofItemVariant;
-use triton_vm::table::master_table::MasterAuxTable;
 use triton_vm::table::NUM_QUOTIENT_SEGMENTS;
+use triton_vm::table::master_table::MasterAuxTable;
 
 use crate::arithmetic::i128;
+use crate::arithmetic::u32;
+use crate::arithmetic::u64;
 use crate::arithmetic::u128;
 use crate::arithmetic::u128::shift_left_static::ShiftLeftStatic as SShlU128;
 use crate::arithmetic::u128::shift_right_static::ShiftRightStatic as SShrU128;
-use crate::arithmetic::u32;
-use crate::arithmetic::u64;
 use crate::array::horner_evaluation::HornerEvaluation;
 use crate::array::inner_product_of_three_rows_with_weights::InnerProductOfThreeRowsWithWeights;
 use crate::array::inner_product_of_three_rows_with_weights::MainElementType;
 use crate::array::inner_product_of_xfes::InnerProductOfXfes;
 use crate::hashing;
 use crate::hashing::algebraic_hasher;
 use crate::hashing::sponge_hasher;
+use crate::io::InputSource;
 use crate::io::read_input::ReadInput;
 use crate::io::write_to_stdout::WriteToStdout;
-use crate::io::InputSource;
 use crate::list;
 use crate::memory::dyn_malloc::DynMalloc;
 use crate::memory::memcpy::MemCpy;

tasm-lib/src/lib.rs

@@ -333,15 +333,16 @@ pub mod test_prelude {
     pub use itertools::Itertools;
     pub use proptest::prelude::*;
     pub use proptest_arbitrary_interop::arb;
+    pub use rand::Rng;
+    pub use rand::RngCore;
+    pub use rand::SeedableRng;
     pub use rand::prelude::IndexedMutRandom;
     pub use rand::prelude::IndexedRandom;
     pub use rand::prelude::IteratorRandom;
     pub use rand::rngs::StdRng;
-    pub use rand::Rng;
-    pub use rand::RngCore;
-    pub use rand::SeedableRng;
     pub use test_strategy::proptest;
 
+    pub use crate::InitVmState;
     pub use crate::memory::encode_to_memory;
     pub(crate) use crate::pop_encodable;
     pub use crate::push_encodable;
@@ -369,5 +370,4 @@ pub mod test_prelude {
     pub use crate::traits::read_only_algorithm::ReadOnlyAlgorithmInitialState;
     pub use crate::traits::read_only_algorithm::ShadowedReadOnlyAlgorithm;
     pub use crate::traits::rust_shadow::RustShadow;
-    pub use crate::InitVmState;
 }

tasm-lib/src/library.rs

@@ -174,8 +174,8 @@ impl Library {
 
 #[cfg(test)]
 mod tests {
-    use triton_vm::prelude::triton_asm;
     use triton_vm::prelude::Program;
+    use triton_vm::prelude::triton_asm;
 
     use super::*;
     use crate::mmr::calculate_new_peaks_from_leaf_mutation::MmrCalculateNewPeaksFromLeafMutationMtIndices;

tasm-lib/src/list/get.rs

@@ -119,11 +119,11 @@ pub(crate) mod tests {
     use triton_vm::error::OpStackError::FailedU32Conversion;
 
     use super::*;
+    use crate::U32_TO_USIZE_ERR;
     use crate::rust_shadowing_helper_functions::list::insert_random_list;
     use crate::rust_shadowing_helper_functions::list::list_get;
     use crate::test_helpers::negative_test;
     use crate::test_prelude::*;
-    use crate::U32_TO_USIZE_ERR;
 
     impl Get {
         fn set_up_initial_state(

tasm-lib/src/list/higher_order/all.rs

@@ -126,8 +126,8 @@ mod tests {
     use super::*;
     use crate::arithmetic;
     use crate::empty_stack;
-    use crate::list::higher_order::inner_function::RawCode;
     use crate::list::LIST_METADATA_SIZE;
+    use crate::list::higher_order::inner_function::RawCode;
     use crate::rust_shadowing_helper_functions;
     use crate::rust_shadowing_helper_functions::list::list_get;
     use crate::rust_shadowing_helper_functions::list::untyped_insert_random_list;

tasm-lib/src/list/higher_order/filter.rs

@@ -2,11 +2,11 @@ use itertools::Itertools;
 use triton_vm::prelude::*;
 
 use super::inner_function::InnerFunction;
+use crate::list::LIST_METADATA_SIZE;
 use crate::list::get::Get;
 use crate::list::length::Length;
 use crate::list::new::New;
 use crate::list::set_length::SetLength;
-use crate::list::LIST_METADATA_SIZE;
 use crate::memory::memcpy::MemCpy;
 use crate::prelude::*;
 

tasm-lib/src/list/higher_order/zip.rs

@@ -5,14 +5,14 @@ use rand::prelude::*;
 use triton_vm::isa::op_stack::NUM_OP_STACK_REGISTERS;
 use triton_vm::prelude::*;
 
+use crate::InitVmState;
 use crate::empty_stack;
-use crate::list::new::New;
 use crate::list::LIST_METADATA_SIZE;
+use crate::list::new::New;
 use crate::prelude::*;
 use crate::rust_shadowing_helper_functions::list::untyped_insert_random_list;
 use crate::snippet_bencher::BenchmarkCase;
 use crate::traits::function::*;
-use crate::InitVmState;
 
 /// Zips two lists of equal length, returning a new list of pairs of elements.
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]

tasm-lib/src/list/set.rs

@@ -121,11 +121,11 @@ mod tests {
     use triton_vm::error::OpStackError::FailedU32Conversion;
 
     use super::*;
+    use crate::U32_TO_USIZE_ERR;
     use crate::rust_shadowing_helper_functions::list::insert_random_list;
     use crate::rust_shadowing_helper_functions::list::list_set;
     use crate::test_helpers::negative_test;
     use crate::test_prelude::*;
-    use crate::U32_TO_USIZE_ERR;
 
     impl Set {
         fn set_up_initial_state(