Remove some reexports

basic/src/lib.rs

@@ -38,8 +38,8 @@ use valida_cpu::{
 use valida_cpu::{CpuChip, MachineWithCpuChip};
 use valida_derive::Machine;
 use valida_machine::{
-    AbstractExtensionField, AbstractField, AdviceProvider, BusArgument, Chip, ChipProof,
-    ExtensionField, Instruction, Machine, MachineProof, PrimeField64, ProgramROM, ValidaAirBuilder,
+    AdviceProvider, BusArgument, Chip, ChipProof, Instruction, Machine, MachineProof, ProgramROM,
+    ValidaAirBuilder,
 };
 use valida_memory::{MachineWithMemoryChip, MemoryChip};
 use valida_output::{MachineWithOutputChip, OutputChip, WriteInstruction};

derive/src/lib.rs

@@ -236,6 +236,7 @@ fn prove_method(chips: &[&Field]) -> TokenStream2 {
         {
             use ::valida_machine::__internal::*;
             use ::valida_machine::__internal::p3_air::{BaseAir};
+            use ::valida_machine::__internal::p3_field::{AbstractField};
             use ::valida_machine::__internal::p3_challenger::{CanObserve, FieldChallenger};
             use ::valida_machine::__internal::p3_commit::{Pcs, UnivariatePcs, UnivariatePcsWithLde};
             use ::valida_machine::__internal::p3_matrix::{Matrix, dense::RowMajorMatrix};

machine/src/__internal.rs

@@ -10,5 +10,6 @@ pub use crate::symbolic::symbolic_builder::*;
 pub use p3_air;
 pub use p3_challenger;
 pub use p3_commit;
+pub use p3_field;
 pub use p3_matrix;
 pub use p3_util;

machine/src/core.rs

@@ -1,6 +1,7 @@
-use super::{Field, PrimeField, MEMORY_CELL_BYTES};
+use super::MEMORY_CELL_BYTES;
 use core::cmp::Ordering;
 use core::ops::{Add, BitAnd, BitOr, BitXor, Div, Index, IndexMut, Mul, Shl, Shr, Sub};
+use p3_field::{Field, PrimeField};
 
 // Currently stored in big-endian form.
 #[derive(Copy, Clone, Debug, Default)]

machine/src/lib.rs

@@ -3,12 +3,6 @@
 extern crate alloc;
 extern crate self as valida_machine;
 
-pub use crate::core::Word;
-pub use chip::{BusArgument, Chip, Interaction, InteractionType, ValidaAirBuilder};
-pub use p3_field::{
-    AbstractExtensionField, AbstractField, ExtensionField, Field, PrimeField, PrimeField64,
-};
-
 pub mod __internal;
 mod advice;
 mod check_constraints;