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(

tasm-lib/src/list/set_length.rs

@@ -66,10 +66,10 @@ impl BasicSnippet for SetLength {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
+    use crate::U32_TO_USIZE_ERR;
     use crate::empty_stack;
     use crate::rust_shadowing_helper_functions::list::list_set_length;
     use crate::test_prelude::*;
-    use crate::U32_TO_USIZE_ERR;
 
     impl Function for SetLength {
         fn rust_shadow(

tasm-lib/src/list/split_off.rs

@@ -148,14 +148,14 @@ mod tests {
     use proptest::strategy::Union;
 
     use super::*;
+    use crate::U32_TO_USIZE_ERR;
     use crate::list::LIST_METADATA_SIZE;
     use crate::rust_shadowing_helper_functions::dyn_malloc::dynamic_allocator;
     use crate::rust_shadowing_helper_functions::list::insert_random_list;
     use crate::rust_shadowing_helper_functions::list::list_set_length;
     use crate::rust_shadowing_helper_functions::list::load_list_unstructured;
     use crate::test_helpers::test_assertion_failure;
     use crate::test_prelude::*;
-    use crate::U32_TO_USIZE_ERR;
 
     impl SplitOff {
         fn set_up_initial_state(

tasm-lib/src/mmr/calculate_new_peaks_from_append.rs

@@ -117,8 +117,8 @@ mod tests {
     use twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
 
     use super::*;
-    use crate::memory::dyn_malloc::DYN_MALLOC_FIRST_ADDRESS;
     use crate::memory::FIRST_NON_DETERMINISTICALLY_INITIALIZED_MEMORY_ADDRESS;
+    use crate::memory::dyn_malloc::DYN_MALLOC_FIRST_ADDRESS;
     use crate::rust_shadowing_helper_functions::list::list_pop;
     use crate::rust_shadowing_helper_functions::list::list_push;
     use crate::test_prelude::*;

tasm-lib/src/mmr/calculate_new_peaks_from_leaf_mutation.rs

@@ -139,8 +139,8 @@ mod tests {
     use crate::twenty_first::math::other::random_elements;
     use crate::twenty_first::prelude::*;
     use crate::twenty_first::util_types::mmr;
-    use crate::twenty_first::util_types::mmr::mmr_accumulator::util::mmra_with_mps;
     use crate::twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
+    use crate::twenty_first::util_types::mmr::mmr_accumulator::util::mmra_with_mps;
     use crate::twenty_first::util_types::mmr::mmr_trait::LeafMutation;
 
     // These consts are an improvement to the previous situation.

tasm-lib/src/mmr/verify_from_secret_in_leaf_index_on_stack.rs

@@ -89,8 +89,8 @@ impl BasicSnippet for MmrVerifyFromSecretInLeafIndexOnStack {
 #[cfg(test)]
 mod tests {
     use twenty_first::math::other::random_elements;
-    use twenty_first::util_types::mmr::mmr_accumulator::util::mmra_with_mps;
     use twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
+    use twenty_first::util_types::mmr::mmr_accumulator::util::mmra_with_mps;
     use twenty_first::util_types::mmr::mmr_membership_proof::MmrMembershipProof;
     use twenty_first::util_types::mmr::mmr_trait::Mmr;
     use twenty_first::util_types::mmr::shared_basic::leaf_index_to_mt_index_and_peak_index;

tasm-lib/src/mmr/verify_from_secret_in_secret_leaf_index.rs

@@ -105,8 +105,8 @@ mod tests {
     use num::One;
     use tasm_lib::test_helpers::test_assertion_failure;
     use twenty_first::math::other::random_elements;
-    use twenty_first::util_types::mmr::mmr_accumulator::util::mmra_with_mps;
     use twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
+    use twenty_first::util_types::mmr::mmr_accumulator::util::mmra_with_mps;
     use twenty_first::util_types::mmr::mmr_membership_proof::MmrMembershipProof;
     use twenty_first::util_types::mmr::mmr_trait::Mmr;
     use twenty_first::util_types::mmr::shared_basic::leaf_index_to_mt_index_and_peak_index;

tasm-lib/src/rust_shadowing_helper_functions/list.rs

@@ -5,11 +5,11 @@ use num_traits::ConstOne;
 use triton_vm::prelude::*;
 use twenty_first::math::other::random_elements;
 
+use crate::U32_TO_USIZE_ERR;
+use crate::USIZE_TO_U64_ERR;
 use crate::list::LIST_METADATA_SIZE;
 use crate::memory::dyn_malloc::DYN_MALLOC_PAGE_SIZE;
 use crate::prelude::*;
-use crate::U32_TO_USIZE_ERR;
-use crate::USIZE_TO_U64_ERR;
 
 /// Load a list from memory returning each element as a list of `BFieldElement`s.
 pub fn load_list_unstructured(

tasm-lib/src/snippet_bencher.rs

@@ -1,5 +1,5 @@
-use std::fs::create_dir_all;
 use std::fs::File;
+use std::fs::create_dir_all;
 use std::path::Path;
 use std::path::PathBuf;
 

tasm-lib/src/structure/manual_tasm_object_implementations.rs

@@ -598,8 +598,8 @@ mod tests {
     use proptest::prelude::*;
     use proptest::test_runner::TestCaseResult;
     use proptest_arbitrary_interop::arb;
-    use test_strategy::proptest;
     use test_strategy::Arbitrary;
+    use test_strategy::proptest;
 
     use super::*;
     use crate::memory::encode_to_memory;

tasm-lib/src/test_helpers.rs

@@ -5,14 +5,14 @@ use itertools::Itertools;
 use triton_vm::isa::op_stack::NUM_OP_STACK_REGISTERS;
 use triton_vm::prelude::*;
 
+use crate::InitVmState;
+use crate::RustShadowOutputState;
 use crate::dyn_malloc::DYN_MALLOC_ADDRESS;
 use crate::execute_test;
 use crate::execute_with_terminal_state;
 use crate::prelude::Tip5;
 use crate::traits::basic_snippet::SignedOffSnippet;
 use crate::traits::rust_shadow::RustShadow;
-use crate::InitVmState;
-use crate::RustShadowOutputState;
 
 pub fn rust_final_state<T: RustShadow>(
     shadowed_snippet: &T,

tasm-lib/src/traits/accessor.rs

@@ -5,13 +5,13 @@ use triton_vm::prelude::*;
 
 use super::basic_snippet::BasicSnippet;
 use super::rust_shadow::RustShadow;
+use crate::InitVmState;
 use crate::linker::execute_bench;
 use crate::prelude::Tip5;
-use crate::snippet_bencher::write_benchmarks;
 use crate::snippet_bencher::BenchmarkCase;
 use crate::snippet_bencher::NamedBenchmarkResult;
+use crate::snippet_bencher::write_benchmarks;
 use crate::test_helpers::test_rust_equivalence_given_complete_state;
-use crate::InitVmState;
 
 /// An Accessor can modify that stack but only read from memory
 ///

tasm-lib/src/traits/algorithm.rs

@@ -5,13 +5,13 @@ use triton_vm::prelude::*;
 
 use super::basic_snippet::BasicSnippet;
 use super::rust_shadow::RustShadow;
+use crate::InitVmState;
 use crate::linker::execute_bench;
 use crate::prelude::Tip5;
-use crate::snippet_bencher::write_benchmarks;
 use crate::snippet_bencher::BenchmarkCase;
 use crate::snippet_bencher::NamedBenchmarkResult;
+use crate::snippet_bencher::write_benchmarks;
 use crate::test_helpers::test_rust_equivalence_given_complete_state;
-use crate::InitVmState;
 
 /// An Algorithm can modify memory and take ND_input.
 ///

tasm-lib/src/traits/closure.rs

@@ -6,9 +6,9 @@ use super::rust_shadow::RustShadow;
 use crate::linker::execute_bench;
 use crate::prelude::Tip5;
 use crate::push_encodable;
-use crate::snippet_bencher::write_benchmarks;
 use crate::snippet_bencher::BenchmarkCase;
 use crate::snippet_bencher::NamedBenchmarkResult;
+use crate::snippet_bencher::write_benchmarks;
 use crate::test_helpers::test_rust_equivalence_given_complete_state;
 
 /// A Closure is a piece of tasm code that modifies the top of the stack without access to

tasm-lib/src/traits/compiled_program.rs

@@ -1,5 +1,5 @@
-use anyhow::anyhow;
 use anyhow::Result;
+use anyhow::anyhow;
 use triton_vm::prelude::*;
 
 use crate::library::Library;
@@ -53,8 +53,8 @@ pub fn bench_and_profile_program<P: CompiledProgram>(
     public_input: &PublicInput,
     nondeterminism: &NonDeterminism,
 ) {
-    use std::fs::create_dir_all;
     use std::fs::File;
+    use std::fs::create_dir_all;
     use std::io::Write;
     use std::path::Path;
     use std::path::PathBuf;

tasm-lib/src/traits/function.rs

@@ -5,13 +5,13 @@ use triton_vm::prelude::*;
 
 use super::basic_snippet::BasicSnippet;
 use super::rust_shadow::RustShadow;
+use crate::InitVmState;
 use crate::linker::execute_bench;
 use crate::prelude::Tip5;
-use crate::snippet_bencher::write_benchmarks;
 use crate::snippet_bencher::BenchmarkCase;
 use crate::snippet_bencher::NamedBenchmarkResult;
+use crate::snippet_bencher::write_benchmarks;
 use crate::test_helpers::test_rust_equivalence_given_complete_state;
-use crate::InitVmState;
 
 /// A function can modify stack and extend memory.
 ///

tasm-lib/src/traits/mem_preserver.rs

@@ -6,12 +6,12 @@ use triton_vm::prelude::*;
 
 use super::basic_snippet::BasicSnippet;
 use super::rust_shadow::RustShadow;
+use crate::InitVmState;
 use crate::linker::execute_bench;
-use crate::snippet_bencher::write_benchmarks;
 use crate::snippet_bencher::BenchmarkCase;
 use crate::snippet_bencher::NamedBenchmarkResult;
+use crate::snippet_bencher::write_benchmarks;
 use crate::test_helpers::test_rust_equivalence_given_complete_state;
-use crate::InitVmState;
 
 /// A MemPreserver cannot modify memory
 ///

tasm-lib/src/traits/procedure.rs

@@ -3,15 +3,15 @@ use std::collections::HashMap;
 use rand::prelude::*;
 use triton_vm::prelude::*;
 
+use crate::InitVmState;
 use crate::linker::execute_bench;
 use crate::prelude::Tip5;
-use crate::snippet_bencher::write_benchmarks;
 use crate::snippet_bencher::BenchmarkCase;
 use crate::snippet_bencher::NamedBenchmarkResult;
+use crate::snippet_bencher::write_benchmarks;
 use crate::test_helpers::test_rust_equivalence_given_complete_state;
 use crate::traits::basic_snippet::BasicSnippet;
 use crate::traits::rust_shadow::RustShadow;
-use crate::InitVmState;
 
 /// A trait that can modify all parts of the VM state.
 ///

tasm-lib/src/traits/read_only_algorithm.rs

@@ -6,13 +6,13 @@ use triton_vm::prelude::*;
 
 use super::basic_snippet::BasicSnippet;
 use super::rust_shadow::RustShadow;
+use crate::InitVmState;
 use crate::linker::execute_bench;
 use crate::prelude::Tip5;
-use crate::snippet_bencher::write_benchmarks;
 use crate::snippet_bencher::BenchmarkCase;
 use crate::snippet_bencher::NamedBenchmarkResult;
+use crate::snippet_bencher::write_benchmarks;
 use crate::test_helpers::test_rust_equivalence_given_complete_state;
-use crate::InitVmState;
 
 /// An ReadOnlyAlgorithm can read memory and take ND_input.
 ///