refactor: canonicalize uses

- use external paths over internal paths to signify true origin
- use `prelude` wherever possible
- use shortest possible paths
- expand grouped `use`s into multiple lines
- separate `use`s by blank line: `std`, external, `crate`, `super`
- don't explicitly `use` items covered by wildcard

src/ast_types/tuple.rs

@@ -1,5 +1,5 @@
-use crate::triton_vm::triton_asm;
 use itertools::Itertools;
+use tasm_lib::triton_vm::triton_asm;
 
 use crate::ast::FnSignature;
 use crate::libraries::LibraryFunction;

src/lib.rs

@@ -1,24 +1,24 @@
-use itertools::Itertools;
 use std::collections::HashMap;
 use std::env;
 use std::fs;
 use std::fs::File;
 use std::io::Read;
 use std::process;
+
+use itertools::Itertools;
 use syn::ImplItemMethod;
 use syn::Item;
 use syn::ItemEnum;
 use syn::ItemImpl;
 use syn::ItemStruct;
 use syn::UseTree;
 pub use tasm_lib;
-use tasm_lib::prelude::*;
-use tasm_lib::triton_vm::prelude::*;
-
-// TODO: The following import is necessary until `tasm-lib` branch `prelude` is incorporated there.
-#[allow(clippy::single_component_path_imports)]
+pub use tasm_lib::triton_vm;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
+pub use tasm_lib::twenty_first;
+// todo: this is temporarily required for derive macro `TasmObject` until its code generation is cleaned up
 #[allow(unused_imports)]
-use twenty_first;
+use tasm_lib::twenty_first::prelude::BFieldElement;
 
 use ast_types::ListType;
 use graft::CustomTypeRust;

src/libraries/bfe.rs

@@ -1,14 +1,13 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::triton_vm::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 use itertools::Itertools;
 use num::One;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;
 use crate::graft::Graft;
 use crate::subroutine::SubRoutine;
+use crate::twenty_first::shared_math::traits::PrimitiveRootOfUnity;
 
 use super::tasm_lib_snippet_to_fn_signature;
 use super::Library;

src/libraries/bfield_codec.rs

@@ -1,6 +1,5 @@
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use tasm_lib::memory::dyn_malloc;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;

src/libraries/boxed.rs

@@ -1,7 +1,7 @@
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use num::One;
 use tasm_lib::memory::dyn_malloc::DynMalloc;
+use tasm_lib::triton_vm::prelude::triton_asm;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
 
 use crate::ast;
 use crate::ast_types;

src/libraries/core.rs

@@ -1,7 +1,7 @@
-use crate::LabelledInstruction;
 use syn::punctuated::Punctuated;
 use syn::token::Comma;
 use syn::ExprMethodCall;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
 
 use crate::ast::Expr;
 use crate::ast::FnSignature;

src/libraries/core/option_type.rs

@@ -1,4 +1,4 @@
-use crate::triton_vm::triton_asm;
+use tasm_lib::triton_vm::triton_asm;
 
 use crate::ast;
 use crate::ast::FnSignature;

src/libraries/core/result_type.rs

@@ -1,4 +1,4 @@
-use crate::triton_vm::triton_asm;
+use tasm_lib::triton_vm::triton_asm;
 
 use crate::ast;
 use crate::ast::FnSignature;

src/libraries/hasher.rs

@@ -1,7 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::tip5::DIGEST_LENGTH;
-use crate::LabelledInstruction;
-use tasm_lib::Digest;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::tip5::DIGEST_LENGTH;
 
 use crate::ast;
 use crate::ast_types;

src/libraries/tasm.rs

@@ -1,8 +1,9 @@
+use tasm_lib::triton_vm::prelude::*;
+
 use crate::ast;
 use crate::ast_types;
 use crate::graft::Graft;
 use crate::tasm_code_generator::CompilerState;
-use crate::triton_vm::prelude::*;
 
 use super::tasm_lib_snippet_to_fn_signature;
 use super::Library;

src/libraries/unsigned_integers.rs

@@ -1,5 +1,5 @@
-use crate::triton_vm::prelude::*;
 use tasm_lib::traits::basic_snippet::BasicSnippet;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;

src/libraries/vector.rs

@@ -1,9 +1,9 @@
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use itertools::Itertools;
 use num::One;
 use tasm_lib::memory::memcpy::MemCpy;
 use tasm_lib::traits::basic_snippet::BasicSnippet;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
+use tasm_lib::triton_vm::triton_asm;
 
 use crate::ast;
 use crate::ast::FnSignature;

src/libraries/xfe.rs

@@ -1,10 +1,8 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::XFieldElement;
-use crate::triton_vm::twenty_first::shared_math::x_field_element::EXTENSION_DEGREE;
 use itertools::Itertools;
 use num::One;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::prelude::x_field_element::EXTENSION_DEGREE;
 
 use crate::ast;
 use crate::ast_types;

src/tasm_code_generator.rs

@@ -13,7 +13,7 @@ use std::fmt::Display;
 use tasm_lib::library::Library as SnippetState;
 use tasm_lib::prelude::*;
 use tasm_lib::triton_vm::prelude::*;
-use tasm_lib::triton_vm::twenty_first::prelude::*;
+use tasm_lib::twenty_first::prelude::*;
 
 use self::function_state::FunctionState;
 use self::function_state::VarAddr;

src/tasm_code_generator/data_type.rs

@@ -1,8 +1,6 @@
-use crate::triton_vm::op_stack::OpStackElement;
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use tasm_lib::memory::memcpy::MemCpy;
+use tasm_lib::triton_vm::op_stack::OpStackElement;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast_types;
 use crate::tasm_code_generator::read_n_words_from_memory;

src/tasm_code_generator/data_type/array_type.rs

@@ -1,12 +1,15 @@
-use crate::ast::{self, ArrayExpression};
-use crate::tasm_code_generator::{
-    compile_expr, pop_n, write_n_words_to_memory_leaving_address, CompilerState,
-};
-use crate::triton_vm::triton_asm;
-use crate::type_checker::GetType;
-use crate::LabelledInstruction;
-use crate::{ast_types, type_checker};
 use itertools::Itertools;
+use tasm_lib::triton_vm::prelude::*;
+
+use crate::ast;
+use crate::ast::ArrayExpression;
+use crate::ast_types;
+use crate::tasm_code_generator::compile_expr;
+use crate::tasm_code_generator::pop_n;
+use crate::tasm_code_generator::write_n_words_to_memory_leaving_address;
+use crate::tasm_code_generator::CompilerState;
+use crate::type_checker;
+use crate::type_checker::GetType;
 
 pub(crate) fn compile_array_expr(
     state: &mut CompilerState,

src/tasm_code_generator/data_type/enum_type.rs

@@ -1,7 +1,4 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::triton_vm::triton_instr;
-use crate::LabelledInstruction;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;

src/tasm_code_generator/data_type/struct_type.rs

@@ -1,8 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::triton_vm::triton_instr;
-use crate::LabelledInstruction;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast_types;
 use crate::ast_types::StructVariant;

src/tasm_code_generator/data_type/tuple_type.rs

@@ -1,7 +1,9 @@
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
+use tasm_lib::triton_vm::triton_asm;
+
 use crate::ast_types::Tuple;
-use crate::tasm_code_generator::{move_top_stack_value_to_memory, CompilerState};
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
+use crate::tasm_code_generator::move_top_stack_value_to_memory;
+use crate::tasm_code_generator::CompilerState;
 
 impl Tuple {
     /// ```text

src/tasm_code_generator/inner_function_tasm_code.rs

@@ -1,5 +1,6 @@
+use tasm_lib::triton_vm::triton_asm;
+
 use crate::subroutine::SubRoutine;
-use crate::triton_vm::triton_asm;
 
 #[derive(Clone, Debug)]
 pub(crate) struct InnerFunctionTasmCode {

src/tasm_code_generator/match_code.rs

@@ -1,14 +1,10 @@
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
+use std::collections::HashSet;
+
 use itertools::Itertools;
 use num::One;
-use std::collections::HashSet;
+use tasm_lib::triton_vm::prelude::LabelledInstruction;
+use tasm_lib::triton_vm::triton_asm;
 
-use super::compile_block_stmt;
-use super::compile_returning_block_expr;
-use super::pop_n;
-use super::CompilerState;
-use super::ValueIdentifier;
 use crate::ast;
 use crate::ast::MatchCondition;
 use crate::ast::MatchExpr;
@@ -18,6 +14,12 @@ use crate::type_checker;
 use crate::type_checker::GetType;
 use crate::type_checker::Typing;
 
+use super::compile_block_stmt;
+use super::compile_returning_block_expr;
+use super::pop_n;
+use super::CompilerState;
+use super::ValueIdentifier;
+
 impl MatchExpr<Typing> {
     /// Return the code that evaluates to true iff the catch-all branch in a match statement
     /// should be taken.

src/tasm_code_generator/outer_function_tasm_code.rs

@@ -1,14 +1,12 @@
 use std::collections::HashMap;
 use std::str::FromStr;
 
-use crate::triton_vm::instruction;
-use crate::triton_vm::op_stack::NumberOfWords;
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::triton_asm;
-use crate::LabelledInstruction;
 use chrono::Local;
 use itertools::Itertools;
 use tasm_lib::library::Library as SnippetState;
+use tasm_lib::triton_vm::instruction;
+use tasm_lib::triton_vm::op_stack::NumberOfWords;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast;
 use crate::ast_types;

src/tasm_code_generator/stack.rs

@@ -1,6 +1,5 @@
-use crate::triton_vm::prelude::*;
-use crate::LabelledInstruction;
 use itertools::Itertools;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::ast_types;
 

src/tests_and_benchmarks/benchmarks.rs

@@ -3,6 +3,7 @@ use std::fs::create_dir_all;
 use std::io::Write;
 use std::path::Path;
 use std::path::PathBuf;
+
 use tasm_lib::snippet_bencher::write_benchmarks;
 use tasm_lib::snippet_bencher::BenchmarkCase;
 use tasm_lib::snippet_bencher::BenchmarkResult;

src/tests_and_benchmarks/benchmarks/mmr.rs

@@ -2,14 +2,13 @@
 mod benchmark {
     use std::collections::HashMap;
 
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::other::random_elements;
-    use crate::triton_vm::twenty_first::shared_math::tip5::Tip5;
-    use crate::triton_vm::twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
-    use crate::triton_vm::twenty_first::util_types::mmr::mmr_trait::Mmr;
-
     use rand::random;
     use tasm_lib::rust_shadowing_helper_functions;
+    use tasm_lib::triton_vm::prelude::*;
+    use tasm_lib::twenty_first::shared_math::other::random_elements;
+    use tasm_lib::twenty_first::shared_math::tip5::Tip5;
+    use tasm_lib::twenty_first::util_types::mmr::mmr_accumulator::MmrAccumulator;
+    use tasm_lib::twenty_first::util_types::mmr::mmr_trait::Mmr;
     use tasm_lib::Digest;
 
     use crate::tests_and_benchmarks::benchmarks::execute_and_write_benchmark;

src/tests_and_benchmarks/ozk/ozk_parsing.rs

@@ -4,9 +4,9 @@ use crate::ast_types;
 use crate::custom_type_resolver::resolve_custom_types;
 use crate::extract_types_and_function;
 use crate::tasm_code_generator::compile_function;
-use crate::triton_vm::prelude::*;
 use crate::type_checker::annotate_fn_outer;
 use crate::StructsAndMethodsRustAst;
+use tasm_lib::triton_vm::prelude::*;
 
 const MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR");
 const PROGRAMS_DIR: &str = "src/tests_and_benchmarks/ozk/programs";

src/tests_and_benchmarks/ozk/programs/arithmetic/bfe_add.rs

@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 

src/tests_and_benchmarks/ozk/programs/arithmetic/dazefield_element_mul.rs

@@ -1,4 +1,4 @@
-use crate::triton_vm::prelude::*;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -56,8 +56,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::triton_vm::prelude::*;
 
     use proptest::collection::vec;
     use proptest::prelude::*;
@@ -92,7 +91,7 @@ mod test {
 }
 
 mod benches {
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use crate::tests_and_benchmarks::benchmarks::execute_and_write_benchmark;
     use crate::tests_and_benchmarks::benchmarks::profile;

src/tests_and_benchmarks/ozk/programs/arithmetic/mod_pow_u32.rs

@@ -1,6 +1,6 @@
-use crate::triton_vm::prelude::*;
-use crate::triton_vm::twenty_first::shared_math::traits::ModPowU32;
 use num::One;
+use tasm_lib::triton_vm::prelude::*;
+use tasm_lib::twenty_first::shared_math::traits::ModPowU32;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 

src/tests_and_benchmarks/ozk/programs/arithmetic/montyred.rs

@@ -54,8 +54,7 @@ fn main() {
 #[cfg(test)]
 mod test {
 
-    use crate::triton_vm::prelude::*;
-    use crate::triton_vm::twenty_first::shared_math::bfield_codec::BFieldCodec;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
 

src/tests_and_benchmarks/ozk/programs/arrays/bfe_array.rs

@@ -1,5 +1,5 @@
-use crate::triton_vm::prelude::*;
 use num::Zero;
+use tasm_lib::triton_vm::prelude::*;
 
 use crate::tests_and_benchmarks::ozk::rust_shadows as tasm;
 
@@ -53,7 +53,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use crate::triton_vm::prelude::*;
+    use tasm_lib::triton_vm::prelude::*;
 
     use itertools::Itertools;
     use rand::random;