chore: simplify uses

TritonVM · Oct 18, 2023 · 51878fa · 51878fa
1 parent 202cb74
commit 51878fa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 37 deletions.
diff --git a/triton-vm/src/op_stack.rs b/triton-vm/src/op_stack.rs
@@ -15,10 +15,9 @@ use twenty_first::shared_math::digest::Digest;
 use twenty_first::shared_math::tip5::DIGEST_LENGTH;
 use twenty_first::shared_math::x_field_element::XFieldElement;
 
+use crate::error::InstructionError::*;
 use crate::op_stack::OpStackElement::*;
 
-use super::error::InstructionError::*;
-
 /// The number of registers dedicated to the top of the operational stack.
 pub const NUM_OP_STACK_REGISTERS: usize = OpStackElement::COUNT;
 

diff --git a/triton-vm/src/table/op_stack_table.rs b/triton-vm/src/table/op_stack_table.rs
@@ -16,23 +16,13 @@ use crate::aet::AlgebraicExecutionTrace;
 use crate::op_stack::OpStackElement;
 use crate::table::challenges::ChallengeId::*;
 use crate::table::challenges::Challenges;
-use crate::table::constraint_circuit::ConstraintCircuitBuilder;
-use crate::table::constraint_circuit::DualRowIndicator;
 use crate::table::constraint_circuit::DualRowIndicator::*;
-use crate::table::constraint_circuit::SingleRowIndicator;
 use crate::table::constraint_circuit::SingleRowIndicator::*;
-use crate::table::cross_table_argument::CrossTableArg;
-use crate::table::cross_table_argument::LookupArg;
-use crate::table::cross_table_argument::PermArg;
-use crate::table::table_column::MasterBaseTableColumn;
-use crate::table::table_column::MasterExtTableColumn;
-use crate::table::table_column::OpStackBaseTableColumn;
+use crate::table::constraint_circuit::*;
+use crate::table::cross_table_argument::*;
 use crate::table::table_column::OpStackBaseTableColumn::*;
-use crate::table::table_column::OpStackExtTableColumn;
 use crate::table::table_column::OpStackExtTableColumn::*;
-use crate::table::table_column::ProcessorBaseTableColumn;
-
-use super::constraint_circuit::ConstraintCircuitMonad;
+use crate::table::table_column::*;
 
 pub const BASE_WIDTH: usize = OpStackBaseTableColumn::COUNT;
 pub const EXT_WIDTH: usize = OpStackExtTableColumn::COUNT;

diff --git a/triton-vm/src/table/program_table.rs b/triton-vm/src/table/program_table.rs
@@ -17,22 +17,15 @@ use crate::aet::AlgebraicExecutionTrace;
 use crate::stark::StarkHasher;
 use crate::table::challenges::ChallengeId::*;
 use crate::table::challenges::Challenges;
-use crate::table::constraint_circuit::ConstraintCircuitBuilder;
-use crate::table::constraint_circuit::DualRowIndicator;
 use crate::table::constraint_circuit::DualRowIndicator::*;
-use crate::table::constraint_circuit::SingleRowIndicator;
 use crate::table::constraint_circuit::SingleRowIndicator::*;
+use crate::table::constraint_circuit::*;
 use crate::table::cross_table_argument::CrossTableArg;
 use crate::table::cross_table_argument::EvalArg;
 use crate::table::cross_table_argument::LookupArg;
-use crate::table::table_column::MasterBaseTableColumn;
-use crate::table::table_column::MasterExtTableColumn;
-use crate::table::table_column::ProgramBaseTableColumn;
 use crate::table::table_column::ProgramBaseTableColumn::*;
-use crate::table::table_column::ProgramExtTableColumn;
 use crate::table::table_column::ProgramExtTableColumn::*;
-
-use super::constraint_circuit::ConstraintCircuitMonad;
+use crate::table::table_column::*;
 
 pub const BASE_WIDTH: usize = ProgramBaseTableColumn::COUNT;
 pub const EXT_WIDTH: usize = ProgramExtTableColumn::COUNT;

diff --git a/triton-vm/src/table/ram_table.rs b/triton-vm/src/table/ram_table.rs
@@ -19,23 +19,13 @@ use crate::aet::AlgebraicExecutionTrace;
 use crate::instruction::Instruction;
 use crate::table::challenges::ChallengeId::*;
 use crate::table::challenges::Challenges;
-use crate::table::constraint_circuit::ConstraintCircuitBuilder;
-use crate::table::constraint_circuit::DualRowIndicator;
 use crate::table::constraint_circuit::DualRowIndicator::*;
-use crate::table::constraint_circuit::SingleRowIndicator;
 use crate::table::constraint_circuit::SingleRowIndicator::*;
-use crate::table::cross_table_argument::CrossTableArg;
-use crate::table::cross_table_argument::LookupArg;
-use crate::table::cross_table_argument::PermArg;
-use crate::table::table_column::MasterBaseTableColumn;
-use crate::table::table_column::MasterExtTableColumn;
-use crate::table::table_column::ProcessorBaseTableColumn;
-use crate::table::table_column::RamBaseTableColumn;
+use crate::table::constraint_circuit::*;
+use crate::table::cross_table_argument::*;
 use crate::table::table_column::RamBaseTableColumn::*;
-use crate::table::table_column::RamExtTableColumn;
 use crate::table::table_column::RamExtTableColumn::*;
-
-use super::constraint_circuit::ConstraintCircuitMonad;
+use crate::table::table_column::*;
 
 pub const BASE_WIDTH: usize = RamBaseTableColumn::COUNT;
 pub const EXT_WIDTH: usize = RamExtTableColumn::COUNT;