packed_field -> packed (#584)

* `packed_field` -> `packed`

For cleaner imports; "field" is usually clear from context

* fix

evm/src/constraint_consumer.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;
 use plonky2::iop::target::Target;

evm/src/cpu/cpu_stark.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use itertools::Itertools;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 

evm/src/cpu/decode.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/cpu/simple_logic/eq_iszero.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;
 

evm/src/cpu/simple_logic/mod.rs

@@ -2,7 +2,7 @@ mod eq_iszero;
 mod not;
 
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;
 

evm/src/cpu/simple_logic/not.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/cross_table_lookup.rs

@@ -3,7 +3,7 @@ use std::iter::repeat;
 use anyhow::{ensure, Result};
 use itertools::Itertools;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;

evm/src/keccak/keccak_stark.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use itertools::Itertools;
 use log::info;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;

evm/src/keccak/logic.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::PrimeField64;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/keccak/round_flags.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

evm/src/logic.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use itertools::izip;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 

evm/src/lookup.rs

@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 
 use itertools::Itertools;
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

evm/src/memory/memory_stark.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 
 use itertools::{izip, multiunzip, Itertools};
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;

evm/src/permutation.rs

@@ -3,7 +3,7 @@
 use itertools::Itertools;
 use plonky2::field::batch_util::batch_multiply_inplace;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;

evm/src/prover.rs

@@ -1,7 +1,7 @@
 use anyhow::{ensure, Result};
 use plonky2::field::extension::Extendable;
 use plonky2::field::packable::Packable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues};
 use plonky2::field::types::Field;
 use plonky2::field::zero_poly_coset::ZeroPolyOnCoset;

evm/src/stark.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::fri::structure::{
     FriBatchInfo, FriBatchInfoTarget, FriInstanceInfo, FriInstanceInfoTarget, FriOracleInfo,

evm/src/util.rs

@@ -1,6 +1,6 @@
 use itertools::Itertools;
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;

evm/src/vanishing_poly.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::GenericConfig;

evm/src/vars.rs

@@ -1,4 +1,4 @@
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::iop::ext_target::ExtensionTarget;
 

field/src/arch/x86_64/avx2_goldilocks_field.rs

@@ -7,7 +7,7 @@ use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssi
 
 use crate::goldilocks_field::GoldilocksField;
 use crate::ops::Square;
-use crate::packed_field::PackedField;
+use crate::packed::PackedField;
 use crate::types::{Field, Field64};
 
 // Ideally `Avx2GoldilocksField` would wrap `__m256i`. Unfortunately, `__m256i` has an alignment of
@@ -512,7 +512,7 @@ mod tests {
     use crate::arch::x86_64::avx2_goldilocks_field::Avx2GoldilocksField;
     use crate::goldilocks_field::GoldilocksField;
     use crate::ops::Square;
-    use crate::packed_field::PackedField;
+    use crate::packed::PackedField;
     use crate::types::Field64;
 
     fn test_vals_a() -> [GoldilocksField; 4] {

field/src/arch/x86_64/avx512_goldilocks_field.rs

@@ -7,7 +7,7 @@ use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssi
 
 use crate::goldilocks_field::GoldilocksField;
 use crate::ops::Square;
-use crate::packed_field::PackedField;
+use crate::packed::PackedField;
 use crate::types::{Field, Field64};
 
 // Ideally `Avx512GoldilocksField` would wrap `__m512i`. Unfortunately, `__m512i` has an alignment
@@ -409,7 +409,7 @@ mod tests {
     use crate::arch::x86_64::avx512_goldilocks_field::Avx512GoldilocksField;
     use crate::goldilocks_field::GoldilocksField;
     use crate::ops::Square;
-    use crate::packed_field::PackedField;
+    use crate::packed::PackedField;
     use crate::types::Field64;
 
     fn test_vals_a() -> [GoldilocksField; 8] {

field/src/batch_util.rs

@@ -1,5 +1,5 @@
 use crate::packable::Packable;
-use crate::packed_field::PackedField;
+use crate::packed::PackedField;
 use crate::types::Field;
 
 fn pack_with_leftovers_split_point<P: PackedField>(slice: &[P::Scalar]) -> usize {

field/src/fft.rs

@@ -5,7 +5,7 @@ use plonky2_util::{log2_strict, reverse_index_bits_in_place};
 use unroll::unroll_for_loops;
 
 use crate::packable::Packable;
-use crate::packed_field::PackedField;
+use crate::packed::PackedField;
 use crate::polynomial::{PolynomialCoeffs, PolynomialValues};
 use crate::types::Field;
 

field/src/lib.rs

@@ -20,7 +20,7 @@ pub mod interpolation;
 mod inversion;
 pub mod ops;
 pub mod packable;
-pub mod packed_field;
+pub mod packed;
 pub mod polynomial;
 pub mod secp256k1_base;
 pub mod secp256k1_scalar;

field/src/packable.rs

@@ -1,4 +1,4 @@
-use crate::packed_field::PackedField;
+use crate::packed::PackedField;
 use crate::types::Field;
 
 /// Points us to the default packing for a particular field. There may me multiple choices of

field/src/zero_poly_coset.rs

@@ -1,4 +1,4 @@
-use crate::packed_field::PackedField;
+use crate::packed::PackedField;
 use crate::types::Field;
 
 /// Precomputations of the evaluation of `Z_H(X) = X^n - 1` on a coset `gK` with `H <= K`.

plonky2/src/fri/oracle.rs

@@ -1,7 +1,7 @@
 use itertools::Itertools;
 use plonky2_field::extension::Extendable;
 use plonky2_field::fft::FftRootTable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::polynomial::{PolynomialCoeffs, PolynomialValues};
 use plonky2_field::types::Field;
 use plonky2_util::{log2_strict, reverse_index_bits_in_place};

plonky2/src/gates/arithmetic_base.rs

@@ -1,5 +1,5 @@
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 
 use crate::gates::gate::Gate;
 use crate::gates::packed_util::PackedEvaluableBase;

plonky2/src/gates/assert_le.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::{Field, Field64};
 use plonky2_util::{bits_u64, ceil_div_usize};
 

plonky2/src/gates/base_sum.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::{Field, Field64};
 
 use crate::gates::gate::Gate;

plonky2/src/gates/constant.rs

@@ -1,5 +1,5 @@
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 
 use crate::gates::gate::Gate;
 use crate::gates::packed_util::PackedEvaluableBase;

plonky2/src/gates/exponentiation.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use plonky2_field::extension::Extendable;
 use plonky2_field::ops::Square;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::Field;
 
 use crate::gates::gate::Gate;

plonky2/src/gates/packed_util.rs

@@ -1,6 +1,6 @@
 use plonky2_field::extension::Extendable;
 use plonky2_field::packable::Packable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 
 use crate::gates::gate::Gate;
 use crate::gates::util::StridedConstraintConsumer;

plonky2/src/gates/public_input.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 
 use crate::gates::gate::Gate;
 use crate::gates::packed_util::PackedEvaluableBase;

plonky2/src/gates/random_access.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 
 use itertools::Itertools;
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::Field;
 
 use crate::gates::gate::Gate;

plonky2/src/gates/util.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 
 /// Writes constraints yielded by a gate to a buffer, with a given stride.
 /// Permits us to abstract the underlying memory layout. In particular, we can make a matrix of

plonky2/src/plonk/plonk_common.rs

@@ -1,5 +1,5 @@
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::Field;
 
 use crate::fri::oracle::SALT_SIZE;

plonky2/src/plonk/vars.rs

@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use plonky2_field::extension::algebra::ExtensionAlgebra;
 use plonky2_field::extension::{Extendable, FieldExtension};
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::Field;
 
 use crate::hash::hash_types::{HashOut, HashOutTarget, RichField};

plonky2/src/util/reducing.rs

@@ -1,7 +1,7 @@
 use std::borrow::Borrow;
 
 use plonky2_field::extension::{Extendable, FieldExtension};
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::polynomial::PolynomialCoeffs;
 use plonky2_field::types::Field;
 

plonky2/src/util/strided_view.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 use std::mem::size_of;
 use std::ops::{Index, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive};
 
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 
 /// Imagine a slice, but with a stride (a la a NumPy array).
 ///

starky/src/constraint_consumer.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;
 use plonky2::iop::target::Target;

starky/src/fibonacci_stark.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

starky/src/permutation.rs

@@ -3,7 +3,7 @@
 use itertools::Itertools;
 use plonky2::field::batch_util::batch_multiply_inplace;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;

starky/src/prover.rs

@@ -4,7 +4,7 @@ use anyhow::{ensure, Result};
 use itertools::Itertools;
 use plonky2::field::extension::Extendable;
 use plonky2::field::packable::Packable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues};
 use plonky2::field::types::Field;
 use plonky2::field::zero_poly_coset::ZeroPolyOnCoset;

starky/src/stark.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::fri::structure::{
     FriBatchInfo, FriBatchInfoTarget, FriInstanceInfo, FriInstanceInfoTarget, FriOracleInfo,
     FriPolynomialInfo,

starky/src/vanishing_poly.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::GenericConfig;

starky/src/vars.rs

@@ -1,4 +1,4 @@
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::iop::ext_target::ExtensionTarget;
 

system_zero/src/alu/addition.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

system_zero/src/alu/bitops.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

system_zero/src/alu/canonical.rs

@@ -3,7 +3,7 @@
 //! See https://hackmd.io/NC-yRmmtRQSvToTHb96e8Q#Checking-element-validity
 
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

system_zero/src/alu/division.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

system_zero/src/alu/mod.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

system_zero/src/alu/mul_add.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

system_zero/src/alu/rotate_shift.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

system_zero/src/alu/subtraction.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

system_zero/src/core_registers.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

system_zero/src/lookup.rs

@@ -8,7 +8,7 @@ use std::cmp::Ordering;
 
 use itertools::Itertools;
 use plonky2::field::extension::Extendable;
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::types::{Field, PrimeField64};
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

system_zero/src/permutation_unit.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::hash::hash_types::RichField;
 use plonky2::hash::hashing::SPONGE_WIDTH;
 use plonky2::hash::poseidon::{Poseidon, HALF_N_FULL_ROUNDS, N_PARTIAL_ROUNDS};

system_zero/src/system_zero.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::packed_field::PackedField;
+use plonky2::field::packed::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

u32/src/gates/arithmetic_u32.rs

@@ -17,7 +17,7 @@ use plonky2::plonk::vars::{
     EvaluationVarsBasePacked,
 };
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::Field;
 
 /// A gate to perform a basic mul-add on 32-bit values (we assume they are range-checked beforehand).

u32/src/gates/comparison.rs

@@ -16,7 +16,7 @@ use plonky2::plonk::vars::{
     EvaluationVarsBasePacked,
 };
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::{Field, Field64};
 use plonky2_util::{bits_u64, ceil_div_usize};
 

u32/src/gates/subtraction_u32.rs

@@ -16,7 +16,7 @@ use plonky2::plonk::vars::{
     EvaluationVarsBasePacked,
 };
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::Field;
 
 /// A gate to perform a subtraction on 32-bit limbs: given `x`, `y`, and `borrow`, it returns

waksman/src/gates/switch.rs

@@ -17,7 +17,7 @@ use plonky2::plonk::vars::{
     EvaluationVarsBasePacked,
 };
 use plonky2_field::extension::Extendable;
-use plonky2_field::packed_field::PackedField;
+use plonky2_field::packed::PackedField;
 use plonky2_field::types::Field;
 
 /// A gate for conditionally swapping input values based on a boolean.