field_types -> types (#583)

* `field_types` -> `types`

Here too, I think "field" is usually clear from context, e.g. in `use plonky2::field::types::Field;`.

* fixes

* fmt

ecdsa/src/curve/curve_adds.rs

@@ -1,7 +1,7 @@
 use std::ops::Add;
 
-use plonky2_field::field_types::Field;
 use plonky2_field::ops::Square;
+use plonky2_field::types::Field;
 
 use crate::curve::curve_types::{AffinePoint, Curve, ProjectivePoint};
 

ecdsa/src/curve/curve_msm.rs

@@ -1,6 +1,6 @@
 use itertools::Itertools;
-use plonky2_field::field_types::Field;
-use plonky2_field::field_types::PrimeField;
+use plonky2_field::types::Field;
+use plonky2_field::types::PrimeField;
 use rayon::prelude::*;
 
 use crate::curve::curve_summation::affine_multisummation_best;
@@ -187,9 +187,9 @@ pub(crate) fn to_digits<C: Curve>(x: &C::ScalarField, w: usize) -> Vec<usize> {
 #[cfg(test)]
 mod tests {
     use num::BigUint;
-    use plonky2_field::field_types::Field;
-    use plonky2_field::field_types::PrimeField;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
+    use plonky2_field::types::PrimeField;
 
     use crate::curve::curve_msm::{msm_execute, msm_precompute, to_digits};
     use crate::curve::curve_types::Curve;

ecdsa/src/curve/curve_multiplication.rs

@@ -1,7 +1,7 @@
 use std::ops::Mul;
 
-use plonky2_field::field_types::Field;
-use plonky2_field::field_types::PrimeField;
+use plonky2_field::types::Field;
+use plonky2_field::types::PrimeField;
 
 use crate::curve::curve_types::{Curve, CurveScalar, ProjectivePoint};
 

ecdsa/src/curve/curve_summation.rs

@@ -1,7 +1,7 @@
 use std::iter::Sum;
 
-use plonky2_field::field_types::Field;
 use plonky2_field::ops::Square;
+use plonky2_field::types::Field;
 
 use crate::curve::curve_types::{AffinePoint, Curve, ProjectivePoint};
 

ecdsa/src/curve/curve_types.rs

@@ -2,8 +2,8 @@ use std::fmt::Debug;
 use std::hash::Hash;
 use std::ops::Neg;
 
-use plonky2_field::field_types::{Field, PrimeField};
 use plonky2_field::ops::Square;
+use plonky2_field::types::{Field, PrimeField};
 use serde::{Deserialize, Serialize};
 
 // To avoid implementation conflicts from associated types,

ecdsa/src/curve/ecdsa.rs

@@ -1,4 +1,4 @@
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 use serde::{Deserialize, Serialize};
 
 use crate::curve::curve_msm::msm_parallel;
@@ -63,8 +63,8 @@ pub fn verify_message<C: Curve>(
 
 #[cfg(test)]
 mod tests {
-    use plonky2_field::field_types::Field;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
 
     use crate::curve::ecdsa::{sign_message, verify_message, ECDSASecretKey};
     use crate::curve::secp256k1::Secp256K1;

ecdsa/src/curve/glv.rs

@@ -1,8 +1,8 @@
 use num::rational::Ratio;
 use num::BigUint;
-use plonky2_field::field_types::{Field, PrimeField};
 use plonky2_field::secp256k1_base::Secp256K1Base;
 use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+use plonky2_field::types::{Field, PrimeField};
 
 use crate::curve::curve_msm::msm_parallel;
 use crate::curve::curve_types::{AffinePoint, ProjectivePoint};
@@ -102,8 +102,8 @@ pub fn glv_mul(p: ProjectivePoint<Secp256K1>, k: Secp256K1Scalar) -> ProjectiveP
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
 
     use crate::curve::curve_types::{Curve, CurveScalar};
     use crate::curve::glv::{decompose_secp256k1_scalar, glv_mul, GLV_S};

ecdsa/src/curve/secp256k1.rs

@@ -1,6 +1,6 @@
-use plonky2_field::field_types::Field;
 use plonky2_field::secp256k1_base::Secp256K1Base;
 use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+use plonky2_field::types::Field;
 use serde::{Deserialize, Serialize};
 
 use crate::curve::curve_types::{AffinePoint, Curve};
@@ -40,9 +40,9 @@ const SECP256K1_GENERATOR_Y: Secp256K1Base = Secp256K1Base([
 #[cfg(test)]
 mod tests {
     use num::BigUint;
-    use plonky2_field::field_types::Field;
-    use plonky2_field::field_types::PrimeField;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
+    use plonky2_field::types::PrimeField;
 
     use crate::curve::curve_types::{AffinePoint, Curve, ProjectivePoint};
     use crate::curve::secp256k1::Secp256K1;

ecdsa/src/gadgets/biguint.rs

@@ -7,7 +7,7 @@ use plonky2::iop::target::{BoolTarget, Target};
 use plonky2::iop::witness::{PartitionWitness, Witness};
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::PrimeField;
+use plonky2_field::types::PrimeField;
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 use plonky2_u32::gadgets::multiple_comparison::list_le_u32_circuit;
 use plonky2_u32::witness::{generated_values_set_u32_target, witness_set_u32_target};

ecdsa/src/gadgets/curve.rs

@@ -2,7 +2,7 @@ use plonky2::hash::hash_types::RichField;
 use plonky2::iop::target::BoolTarget;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar};
 use crate::gadgets::nonnative::{CircuitBuilderNonNative, NonNativeTarget};
@@ -261,9 +261,9 @@ mod tests {
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2_field::field_types::Field;
     use plonky2_field::secp256k1_base::Secp256K1Base;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
 
     use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar};
     use crate::curve::secp256k1::Secp256K1;

ecdsa/src/gadgets/curve_fixed_base.rs

@@ -4,7 +4,7 @@ use plonky2::hash::keccak::KeccakHash;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::{GenericHashOut, Hasher};
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar};
 use crate::gadgets::curve::{AffinePointTarget, CircuitBuilderCurve};
@@ -66,9 +66,9 @@ mod tests {
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2_field::field_types::Field;
-    use plonky2_field::field_types::PrimeField;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
+    use plonky2_field::types::PrimeField;
 
     use crate::curve::curve_types::{Curve, CurveScalar};
     use crate::curve::secp256k1::Secp256K1;

ecdsa/src/gadgets/curve_msm.rs

@@ -4,7 +4,7 @@ use plonky2::hash::keccak::KeccakHash;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::{GenericHashOut, Hasher};
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::curve::curve_types::{Curve, CurveScalar};
 use crate::gadgets::curve::{AffinePointTarget, CircuitBuilderCurve};
@@ -83,8 +83,8 @@ mod tests {
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2_field::field_types::Field;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
 
     use crate::curve::curve_types::{Curve, CurveScalar};
     use crate::curve::secp256k1::Secp256K1;

ecdsa/src/gadgets/curve_windowed_mul.rs

@@ -7,7 +7,7 @@ use plonky2::iop::target::{BoolTarget, Target};
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::{GenericHashOut, Hasher};
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 
 use crate::curve::curve_types::{Curve, CurveScalar};
@@ -176,8 +176,8 @@ mod tests {
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2_field::field_types::Field;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
     use rand::Rng;
 
     use crate::curve::curve_types::{Curve, CurveScalar};

ecdsa/src/gadgets/ecdsa.rs

@@ -56,8 +56,8 @@ mod tests {
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2_field::field_types::Field;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
 
     use super::{ECDSAPublicKeyTarget, ECDSASignatureTarget};
     use crate::curve::curve_types::{Curve, CurveScalar};

ecdsa/src/gadgets/glv.rs

@@ -6,9 +6,9 @@ use plonky2::iop::target::{BoolTarget, Target};
 use plonky2::iop::witness::PartitionWitness;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::{Field, PrimeField};
 use plonky2_field::secp256k1_base::Secp256K1Base;
 use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+use plonky2_field::types::{Field, PrimeField};
 
 use crate::curve::glv::{decompose_secp256k1_scalar, GLV_BETA, GLV_S};
 use crate::curve::secp256k1::Secp256K1;
@@ -137,8 +137,8 @@ mod tests {
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2_field::field_types::Field;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
 
     use crate::curve::curve_types::{Curve, CurveScalar};
     use crate::curve::glv::glv_mul;

ecdsa/src/gadgets/nonnative.rs

@@ -6,8 +6,8 @@ use plonky2::iop::generator::{GeneratedValues, SimpleGenerator};
 use plonky2::iop::target::{BoolTarget, Target};
 use plonky2::iop::witness::PartitionWitness;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
-use plonky2_field::field_types::PrimeField;
-use plonky2_field::{extension::Extendable, field_types::Field};
+use plonky2_field::types::PrimeField;
+use plonky2_field::{extension::Extendable, types::Field};
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 use plonky2_u32::gadgets::range_check::range_check_u32_circuit;
 use plonky2_u32::witness::generated_values_set_u32_target;
@@ -646,8 +646,8 @@ mod tests {
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2_field::field_types::{Field, PrimeField};
     use plonky2_field::secp256k1_base::Secp256K1Base;
+    use plonky2_field::types::{Field, PrimeField};
 
     use crate::gadgets::nonnative::CircuitBuilderNonNative;
 

ecdsa/src/gadgets/split_nonnative.rs

@@ -5,7 +5,7 @@ use plonky2::hash::hash_types::RichField;
 use plonky2::iop::target::Target;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 use plonky2_u32::gadgets::arithmetic_u32::{CircuitBuilderU32, U32Target};
 
 use crate::gadgets::biguint::BigUintTarget;
@@ -100,8 +100,8 @@ mod tests {
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
-    use plonky2_field::field_types::Field;
     use plonky2_field::secp256k1_scalar::Secp256K1Scalar;
+    use plonky2_field::types::Field;
 
     use crate::gadgets::nonnative::{CircuitBuilderNonNative, NonNativeTarget};
     use crate::gadgets::split_nonnative::CircuitBuilderSplit;

evm/src/all_stark.rs

@@ -1,5 +1,5 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::field_types::Field;
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 
 use crate::config::StarkConfig;
@@ -117,8 +117,8 @@ fn ctl_memory<F: Field>(channel: usize) -> CrossTableLookup<F> {
 mod tests {
     use anyhow::Result;
     use itertools::{izip, Itertools};
-    use plonky2::field::field_types::Field;
     use plonky2::field::polynomial::PolynomialValues;
+    use plonky2::field::types::Field;
     use plonky2::iop::witness::PartialWitness;
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;

evm/src/cpu/cpu_stark.rs

@@ -2,8 +2,8 @@ use std::marker::PhantomData;
 
 use itertools::Itertools;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 
 use crate::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer};

evm/src/cpu/decode.rs

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

evm/src/cpu/simple_logic/not.rs

@@ -1,6 +1,6 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::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,9 +3,9 @@ use std::iter::repeat;
 use anyhow::{ensure, Result};
 use itertools::Itertools;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::challenger::Challenger;
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/keccak/keccak_stark.rs

@@ -3,9 +3,9 @@ use std::marker::PhantomData;
 use itertools::Itertools;
 use log::info;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::plonk_common::reduce_with_powers_ext_circuit;
 use plonky2::timed;
@@ -526,7 +526,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for KeccakStark<F
 mod tests {
     use anyhow::Result;
     use keccak_rust::{KeccakF, StateBitsWidth};
-    use plonky2::field::field_types::Field;
+    use plonky2::field::types::Field;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     use crate::keccak::keccak_stark::{KeccakStark, NUM_INPUTS, NUM_ROUNDS};

evm/src/keccak/logic.rs

@@ -1,6 +1,6 @@
 use plonky2::field::extension::Extendable;
-use plonky2::field::field_types::PrimeField64;
 use plonky2::field::packed_field::PackedField;
+use plonky2::field::types::PrimeField64;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;
 use plonky2::plonk::circuit_builder::CircuitBuilder;

evm/src/keccak/registers.rs

@@ -1,4 +1,4 @@
-use plonky2::field::field_types::Field;
+use plonky2::field::types::Field;
 
 use crate::cross_table_lookup::Column;
 use crate::keccak::keccak_stark::{NUM_INPUTS, NUM_ROUNDS};

evm/src/keccak/round_flags.rs

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

evm/src/logic.rs

@@ -2,8 +2,8 @@ use std::marker::PhantomData;
 
 use itertools::izip;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 
 use crate::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer};

evm/src/lookup.rs

@@ -2,8 +2,8 @@ use std::cmp::Ordering;
 
 use itertools::Itertools;
 use plonky2::field::extension::Extendable;
-use plonky2::field::field_types::{Field, PrimeField64};
 use plonky2::field::packed_field::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,9 +3,9 @@ use std::marker::PhantomData;
 
 use itertools::{izip, multiunzip, Itertools};
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::timed;
 use plonky2::util::timing::TimingTree;

evm/src/permutation.rs

@@ -3,9 +3,9 @@
 use itertools::Itertools;
 use plonky2::field::batch_util::batch_multiply_inplace;
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::challenger::{Challenger, RecursiveChallenger};
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/prover.rs

@@ -1,9 +1,9 @@
 use anyhow::{ensure, Result};
 use plonky2::field::extension::Extendable;
-use plonky2::field::field_types::Field;
 use plonky2::field::packable::Packable;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues};
+use plonky2::field::types::Field;
 use plonky2::field::zero_poly_coset::ZeroPolyOnCoset;
 use plonky2::fri::oracle::PolynomialBatch;
 use plonky2::hash::hash_types::RichField;

evm/src/recursive_verifier.rs

@@ -1,6 +1,6 @@
 use itertools::Itertools;
 use plonky2::field::extension::Extendable;
-use plonky2::field::field_types::Field;
+use plonky2::field::types::Field;
 use plonky2::fri::witness_util::set_fri_proof_target;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;

evm/src/stark.rs

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

evm/src/stark_testing.rs

@@ -1,8 +1,8 @@
 use anyhow::{ensure, Result};
 use plonky2::field::extension::Extendable;
 use plonky2::field::extension::FieldExtension;
-use plonky2::field::field_types::Field;
 use plonky2::field::polynomial::{PolynomialCoeffs, PolynomialValues};
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::witness::PartialWitness;
 use plonky2::iop::witness::Witness;

evm/src/util.rs

@@ -1,8 +1,8 @@
 use itertools::Itertools;
 use plonky2::field::extension::Extendable;
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
 use plonky2::field::polynomial::PolynomialValues;
+use plonky2::field::types::Field;
 use plonky2::hash::hash_types::RichField;
 use plonky2::iop::ext_target::ExtensionTarget;
 use plonky2::util::transpose;

evm/src/vars.rs

@@ -1,5 +1,5 @@
-use plonky2::field::field_types::Field;
 use plonky2::field::packed_field::PackedField;
+use plonky2::field::types::Field;
 use plonky2::iop::ext_target::ExtensionTarget;
 
 #[derive(Debug, Copy, Clone)]

evm/src/verifier.rs

@@ -1,6 +1,6 @@
 use anyhow::{ensure, Result};
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::field_types::Field;
+use plonky2::field::types::Field;
 use plonky2::fri::verifier::verify_fri_proof;
 use plonky2::hash::hash_types::RichField;
 use plonky2::plonk::config::{GenericConfig, Hasher};
@@ -225,9 +225,9 @@ fn eval_l_1_and_l_last<F: Field>(log_n: usize, x: F) -> (F, F) {
 
 #[cfg(test)]
 mod tests {
-    use plonky2::field::field_types::Field;
     use plonky2::field::goldilocks_field::GoldilocksField;
     use plonky2::field::polynomial::PolynomialValues;
+    use plonky2::field::types::Field;
 
     use crate::verifier::eval_l_1_and_l_last;
 

field/src/arch/x86_64/avx2_goldilocks_field.rs

@@ -5,10 +5,10 @@ use std::iter::{Product, Sum};
 use std::mem::transmute;
 use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 
-use crate::field_types::{Field, Field64};
 use crate::goldilocks_field::GoldilocksField;
 use crate::ops::Square;
 use crate::packed_field::PackedField;
+use crate::types::{Field, Field64};
 
 // Ideally `Avx2GoldilocksField` would wrap `__m256i`. Unfortunately, `__m256i` has an alignment of
 // 32B, which would preclude us from casting `[GoldilocksField; 4]` (alignment 8B) to
@@ -510,10 +510,10 @@ unsafe fn interleave2(x: __m256i, y: __m256i) -> (__m256i, __m256i) {
 #[cfg(test)]
 mod tests {
     use crate::arch::x86_64::avx2_goldilocks_field::Avx2GoldilocksField;
-    use crate::field_types::Field64;
     use crate::goldilocks_field::GoldilocksField;
     use crate::ops::Square;
     use crate::packed_field::PackedField;
+    use crate::types::Field64;
 
     fn test_vals_a() -> [GoldilocksField; 4] {
         [

field/src/arch/x86_64/avx512_goldilocks_field.rs

@@ -5,10 +5,10 @@ use std::iter::{Product, Sum};
 use std::mem::transmute;
 use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 
-use crate::field_types::{Field, Field64};
 use crate::goldilocks_field::GoldilocksField;
 use crate::ops::Square;
 use crate::packed_field::PackedField;
+use crate::types::{Field, Field64};
 
 // Ideally `Avx512GoldilocksField` would wrap `__m512i`. Unfortunately, `__m512i` has an alignment
 // of 64B, which would preclude us from casting `[GoldilocksField; 8]` (alignment 8B) to
@@ -407,10 +407,10 @@ unsafe fn interleave4(x: __m512i, y: __m512i) -> (__m512i, __m512i) {
 #[cfg(test)]
 mod tests {
     use crate::arch::x86_64::avx512_goldilocks_field::Avx512GoldilocksField;
-    use crate::field_types::Field64;
     use crate::goldilocks_field::GoldilocksField;
     use crate::ops::Square;
     use crate::packed_field::PackedField;
+    use crate::types::Field64;
 
     fn test_vals_a() -> [GoldilocksField; 8] {
         [

field/src/batch_util.rs

@@ -1,6 +1,6 @@
-use crate::field_types::Field;
 use crate::packable::Packable;
 use crate::packed_field::PackedField;
+use crate::types::Field;
 
 fn pack_with_leftovers_split_point<P: PackedField>(slice: &[P::Scalar]) -> usize {
     let n = slice.len();

field/src/cosets.rs

@@ -1,6 +1,6 @@
 use num::bigint::BigUint;
 
-use crate::field_types::Field;
+use crate::types::Field;
 
 /// Finds a set of shifts that result in unique cosets for the multiplicative subgroup of size
 /// `2^subgroup_bits`.
@@ -26,8 +26,8 @@ mod tests {
     use std::collections::HashSet;
 
     use crate::cosets::get_unique_coset_shifts;
-    use crate::field_types::Field;
     use crate::goldilocks_field::GoldilocksField;
+    use crate::types::Field;
 
     #[test]
     fn distinct_cosets() {

field/src/extension/algebra.rs

@@ -194,8 +194,8 @@ mod tests {
 
     use crate::extension::algebra::ExtensionAlgebra;
     use crate::extension::{Extendable, FieldExtension};
-    use crate::field_types::Field;
     use crate::goldilocks_field::GoldilocksField;
+    use crate::types::Field;
 
     /// Tests that the multiplication on the extension algebra lifts that of the field extension.
     fn test_extension_algebra<F: Extendable<D>, const D: usize>() {

field/src/extension/mod.rs

@@ -1,6 +1,6 @@
 use std::convert::TryInto;
 
-use crate::field_types::Field;
+use crate::types::Field;
 
 pub mod algebra;
 pub mod quadratic;

field/src/extension/quadratic.rs

@@ -8,8 +8,8 @@ use rand::Rng;
 use serde::{Deserialize, Serialize};
 
 use crate::extension::{Extendable, FieldExtension, Frobenius, OEF};
-use crate::field_types::Field;
 use crate::ops::Square;
+use crate::types::Field;
 
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
 #[serde(bound = "")]

field/src/extension/quartic.rs

@@ -9,8 +9,8 @@ use rand::Rng;
 use serde::{Deserialize, Serialize};
 
 use crate::extension::{Extendable, FieldExtension, Frobenius, OEF};
-use crate::field_types::Field;
 use crate::ops::Square;
+use crate::types::Field;
 
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
 #[serde(bound = "")]

field/src/extension/quintic.rs

@@ -8,8 +8,8 @@ use rand::Rng;
 use serde::{Deserialize, Serialize};
 
 use crate::extension::{Extendable, FieldExtension, Frobenius, OEF};
-use crate::field_types::Field;
 use crate::ops::Square;
+use crate::types::Field;
 
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
 #[serde(bound = "")]

field/src/fft.rs

@@ -4,10 +4,10 @@ use std::option::Option;
 use plonky2_util::{log2_strict, reverse_index_bits_in_place};
 use unroll::unroll_for_loops;
 
-use crate::field_types::Field;
 use crate::packable::Packable;
 use crate::packed_field::PackedField;
 use crate::polynomial::{PolynomialCoeffs, PolynomialValues};
+use crate::types::Field;
 
 pub type FftRootTable<F> = Vec<Vec<F>>;
 
@@ -210,9 +210,9 @@ mod tests {
     use plonky2_util::{log2_ceil, log2_strict};
 
     use crate::fft::{fft, fft_with_options, ifft};
-    use crate::field_types::Field;
     use crate::goldilocks_field::GoldilocksField;
     use crate::polynomial::{PolynomialCoeffs, PolynomialValues};
+    use crate::types::Field;
 
     #[test]
     fn fft_and_ifft() {

field/src/field_testing.rs

@@ -1,7 +1,7 @@
 use crate::extension::Extendable;
 use crate::extension::Frobenius;
-use crate::field_types::Field;
 use crate::ops::Square;
+use crate::types::Field;
 
 #[macro_export]
 macro_rules! test_field_arithmetic {
@@ -9,7 +9,7 @@ macro_rules! test_field_arithmetic {
         mod field_arithmetic {
             use num::bigint::BigUint;
             use rand::Rng;
-            use $crate::field_types::Field;
+            use $crate::types::Field;
 
             #[test]
             fn batch_inversion() {

field/src/goldilocks_extensions.rs

@@ -6,8 +6,8 @@ use crate::extension::quadratic::QuadraticExtension;
 use crate::extension::quartic::QuarticExtension;
 use crate::extension::quintic::QuinticExtension;
 use crate::extension::{Extendable, Frobenius};
-use crate::field_types::Field;
 use crate::goldilocks_field::{reduce160, GoldilocksField};
+use crate::types::Field;
 
 impl Frobenius<1> for GoldilocksField {}
 

field/src/goldilocks_field.rs

@@ -9,8 +9,8 @@ use plonky2_util::{assume, branch_hint};
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-use crate::field_types::{Field, Field64, PrimeField, PrimeField64};
 use crate::inversion::try_inverse_u64;
+use crate::types::{Field, Field64, PrimeField, PrimeField64};
 
 const EPSILON: u64 = (1 << 32) - 1;
 

field/src/interpolation.rs

@@ -1,8 +1,8 @@
 use plonky2_util::log2_ceil;
 
 use crate::fft::ifft;
-use crate::field_types::Field;
 use crate::polynomial::{PolynomialCoeffs, PolynomialValues};
+use crate::types::Field;
 
 /// Computes the unique degree < n interpolant of an arbitrary list of n (point, value) pairs.
 ///
@@ -79,9 +79,9 @@ pub fn interpolate2<F: Field>(points: [(F, F); 2], x: F) -> F {
 mod tests {
     use super::*;
     use crate::extension::quartic::QuarticExtension;
-    use crate::field_types::Field;
     use crate::goldilocks_field::GoldilocksField;
     use crate::polynomial::PolynomialCoeffs;
+    use crate::types::Field;
 
     #[test]
     fn interpolant_random() {

field/src/inversion.rs

@@ -1,4 +1,4 @@
-use crate::field_types::PrimeField64;
+use crate::types::PrimeField64;
 
 /// This is a 'safe' iteration for the modular inversion algorithm. It
 /// is safe in the sense that it will produce the right answer even

field/src/lib.rs

@@ -14,7 +14,6 @@ pub mod batch_util;
 pub mod cosets;
 pub mod extension;
 pub mod fft;
-pub mod field_types;
 pub mod goldilocks_extensions;
 pub mod goldilocks_field;
 pub mod interpolation;
@@ -25,6 +24,7 @@ pub mod packed_field;
 pub mod polynomial;
 pub mod secp256k1_base;
 pub mod secp256k1_scalar;
+pub mod types;
 pub mod zero_poly_coset;
 
 #[cfg(test)]

field/src/packable.rs

@@ -1,5 +1,5 @@
-use crate::field_types::Field;
 use crate::packed_field::PackedField;
+use crate::types::Field;
 
 /// Points us to the default packing for a particular field. There may me multiple choices of
 /// PackedField for a particular Field (e.g. every Field is also a PackedField), but this is the

field/src/packed_field.rs

@@ -3,8 +3,8 @@ use std::iter::{Product, Sum};
 use std::ops::{Add, AddAssign, Div, Mul, MulAssign, Neg, Sub, SubAssign};
 use std::slice;
 
-use crate::field_types::Field;
 use crate::ops::Square;
+use crate::types::Field;
 
 /// # Safety
 /// - WIDTH is assumed to be a power of 2.

field/src/polynomial/division.rs

@@ -1,7 +1,7 @@
 use plonky2_util::log2_ceil;
 
-use crate::field_types::Field;
 use crate::polynomial::PolynomialCoeffs;
+use crate::types::Field;
 
 impl<F: Field> PolynomialCoeffs<F> {
     /// Polynomial division.
@@ -134,9 +134,9 @@ mod tests {
     use rand::{thread_rng, Rng};
 
     use crate::extension::quartic::QuarticExtension;
-    use crate::field_types::Field;
     use crate::goldilocks_field::GoldilocksField;
     use crate::polynomial::PolynomialCoeffs;
+    use crate::types::Field;
 
     #[test]
     fn test_division_by_linear() {

field/src/polynomial/mod.rs

@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::extension::{Extendable, FieldExtension};
 use crate::fft::{fft, fft_with_options, ifft, FftRootTable};
-use crate::field_types::Field;
+use crate::types::Field;
 
 /// A polynomial in point-value form.
 ///

field/src/prime_field_testing.rs

@@ -1,4 +1,4 @@
-use crate::field_types::PrimeField64;
+use crate::types::PrimeField64;
 
 /// Generates a series of non-negative integers less than `modulus` which cover a range of
 /// interesting test values.
@@ -70,8 +70,8 @@ macro_rules! test_prime_field_arithmetic {
         mod prime_field_arithmetic {
             use std::ops::{Add, Mul, Neg, Sub};
 
-            use $crate::field_types::{Field, Field64};
             use $crate::ops::Square;
+            use $crate::types::{Field, Field64};
 
             #[test]
             fn arithmetic_addition() {

field/src/secp256k1_base.rs

@@ -10,7 +10,7 @@ use num::{Integer, One};
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-use crate::field_types::{Field, PrimeField};
+use crate::types::{Field, PrimeField};
 
 /// The base field of the secp256k1 elliptic curve.
 ///

field/src/secp256k1_scalar.rs

@@ -11,7 +11,7 @@ use num::{Integer, One};
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 
-use crate::field_types::{Field, PrimeField};
+use crate::types::{Field, PrimeField};
 
 /// The base field of the secp256k1 elliptic curve.
 ///

field/src/zero_poly_coset.rs

@@ -1,5 +1,5 @@
-use crate::field_types::Field;
 use crate::packed_field::PackedField;
+use crate::types::Field;
 
 /// Precomputations of the evaluation of `Z_H(X) = X^n - 1` on a coset `gK` with `H <= K`.
 pub struct ZeroPolyOnCoset<F: Field> {

insertion/src/insert_gadget.rs

@@ -50,7 +50,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilderInsert<F, D>
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2::field::field_types::Field;
+    use plonky2::field::types::Field;
     use plonky2::iop::witness::PartialWitness;
     use plonky2::plonk::circuit_data::CircuitConfig;
     use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};

insertion/src/insertion_gate.rs

@@ -2,7 +2,7 @@ use std::marker::PhantomData;
 use std::ops::Range;
 
 use plonky2::field::extension::{Extendable, FieldExtension};
-use plonky2::field::field_types::Field;
+use plonky2::field::types::Field;
 use plonky2::gates::gate::Gate;
 use plonky2::gates::util::StridedConstraintConsumer;
 use plonky2::hash::hash_types::RichField;
@@ -320,8 +320,8 @@ mod tests {
     use std::marker::PhantomData;
 
     use anyhow::Result;
-    use plonky2::field::field_types::Field;
     use plonky2::field::goldilocks_field::GoldilocksField;
+    use plonky2::field::types::Field;
     use plonky2::gates::gate::Gate;
     use plonky2::gates::gate_testing::{test_eval_fns, test_low_degree};
     use plonky2::hash::hash_types::HashOut;

plonky2/benches/ffts.rs

@@ -1,9 +1,9 @@
 mod allocator;
 
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use plonky2::field::field_types::Field;
 use plonky2::field::goldilocks_field::GoldilocksField;
 use plonky2::field::polynomial::PolynomialCoeffs;
+use plonky2::field::types::Field;
 use tynm::type_name;
 
 pub(crate) fn bench_ffts<F: Field>(c: &mut Criterion) {

plonky2/benches/field_arithmetic.rs

@@ -4,8 +4,8 @@ use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 use plonky2::field::extension::quadratic::QuadraticExtension;
 use plonky2::field::extension::quartic::QuarticExtension;
 use plonky2::field::extension::quintic::QuinticExtension;
-use plonky2::field::field_types::Field;
 use plonky2::field::goldilocks_field::GoldilocksField;
+use plonky2::field::types::Field;
 use tynm::type_name;
 
 pub(crate) fn bench_field<F: Field>(c: &mut Criterion) {

plonky2/benches/reverse_index_bits.rs

@@ -1,8 +1,8 @@
 mod allocator;
 
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use plonky2::field::field_types::Field;
 use plonky2::field::goldilocks_field::GoldilocksField;
+use plonky2::field::types::Field;
 use plonky2_util::{reverse_index_bits, reverse_index_bits_in_place};
 
 type F = GoldilocksField;

plonky2/benches/transpose.rs

@@ -1,8 +1,8 @@
 mod allocator;
 
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use plonky2::field::field_types::Field;
 use plonky2::field::goldilocks_field::GoldilocksField;
+use plonky2::field::types::Field;
 use plonky2::util::transpose;
 
 fn criterion_benchmark(c: &mut Criterion) {

plonky2/src/bin/generate_constants.rs

@@ -2,8 +2,8 @@
 
 #![allow(clippy::needless_range_loop)]
 
-use plonky2_field::field_types::Field64;
 use plonky2_field::goldilocks_field::GoldilocksField;
+use plonky2_field::types::Field64;
 use rand::{Rng, SeedableRng};
 use rand_chacha::ChaCha8Rng;
 

plonky2/src/fri/oracle.rs

@@ -1,9 +1,9 @@
 use itertools::Itertools;
 use plonky2_field::extension::Extendable;
 use plonky2_field::fft::FftRootTable;
-use plonky2_field::field_types::Field;
 use plonky2_field::packed_field::PackedField;
 use plonky2_field::polynomial::{PolynomialCoeffs, PolynomialValues};
+use plonky2_field::types::Field;
 use plonky2_util::{log2_strict, reverse_index_bits_in_place};
 use rayon::prelude::*;
 

plonky2/src/fri/verifier.rs

@@ -1,7 +1,7 @@
 use anyhow::{ensure, Result};
 use plonky2_field::extension::{flatten, Extendable, FieldExtension};
-use plonky2_field::field_types::Field;
 use plonky2_field::interpolation::{barycentric_weights, interpolate};
+use plonky2_field::types::Field;
 use plonky2_util::{log2_strict, reverse_index_bits_in_place};
 
 use crate::fri::proof::{FriChallenges, FriInitialTreeProof, FriProof, FriQueryRound};

plonky2/src/gadgets/arithmetic.rs

@@ -1,7 +1,7 @@
 use std::borrow::Borrow;
 
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field64;
+use plonky2_field::types::Field64;
 
 use crate::gates::arithmetic_base::ArithmeticGate;
 use crate::gates::exponentiation::ExponentiationGate;

plonky2/src/gadgets/arithmetic_extension.rs

@@ -2,7 +2,7 @@ use std::borrow::Borrow;
 
 use plonky2_field::extension::FieldExtension;
 use plonky2_field::extension::{Extendable, OEF};
-use plonky2_field::field_types::{Field, Field64};
+use plonky2_field::types::{Field, Field64};
 use plonky2_util::bits_u64;
 
 use crate::gates::arithmetic_extension::ArithmeticExtensionGate;
@@ -570,7 +570,7 @@ pub(crate) struct ExtensionArithmeticOperation<F: Field64 + Extendable<D>, const
 mod tests {
     use anyhow::Result;
     use plonky2_field::extension::algebra::ExtensionAlgebra;
-    use plonky2_field::field_types::Field;
+    use plonky2_field::types::Field;
 
     use crate::iop::ext_target::ExtensionAlgebraTarget;
     use crate::iop::witness::{PartialWitness, Witness};

plonky2/src/gadgets/interpolation.rs

@@ -106,8 +106,8 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 mod tests {
     use anyhow::Result;
     use plonky2_field::extension::FieldExtension;
-    use plonky2_field::field_types::Field;
     use plonky2_field::interpolation::interpolant;
+    use plonky2_field::types::Field;
 
     use crate::gates::interpolation::HighDegreeInterpolationGate;
     use crate::gates::low_degree_interpolation::LowDegreeInterpolationGate;

plonky2/src/gadgets/random_access.rs

@@ -55,7 +55,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
+    use plonky2_field::types::Field;
 
     use super::*;
     use crate::iop::witness::PartialWitness;

plonky2/src/gadgets/select.rs

@@ -41,7 +41,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
+    use plonky2_field::types::Field;
 
     use crate::iop::witness::{PartialWitness, Witness};
     use crate::plonk::circuit_builder::CircuitBuilder;

plonky2/src/gadgets/split_base.rs

@@ -2,7 +2,7 @@ use std::borrow::Borrow;
 
 use itertools::Itertools;
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::gates::base_sum::BaseSumGate;
 use crate::hash::hash_types::RichField;
@@ -99,7 +99,7 @@ impl<F: Field, const B: usize> SimpleGenerator<F> for BaseSumGenerator<B> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
+    use plonky2_field::types::Field;
     use rand::{thread_rng, Rng};
 
     use crate::iop::witness::PartialWitness;

plonky2/src/gates/assert_le.rs

@@ -1,8 +1,8 @@
 use std::marker::PhantomData;
 
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::{Field, Field64};
 use plonky2_field::packed_field::PackedField;
+use plonky2_field::types::{Field, Field64};
 use plonky2_util::{bits_u64, ceil_div_usize};
 
 use crate::gates::gate::Gate;
@@ -451,9 +451,9 @@ mod tests {
 
     use anyhow::Result;
     use plonky2_field::extension::quartic::QuarticExtension;
-    use plonky2_field::field_types::Field;
-    use plonky2_field::field_types::PrimeField64;
     use plonky2_field::goldilocks_field::GoldilocksField;
+    use plonky2_field::types::Field;
+    use plonky2_field::types::PrimeField64;
     use rand::Rng;
 
     use crate::gates::assert_le::AssertLessThanGate;

plonky2/src/gates/base_sum.rs

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

plonky2/src/gates/exponentiation.rs

@@ -1,9 +1,9 @@
 use std::marker::PhantomData;
 
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
 use plonky2_field::ops::Square;
 use plonky2_field::packed_field::PackedField;
+use plonky2_field::types::Field;
 
 use crate::gates::gate::Gate;
 use crate::gates::packed_util::PackedEvaluableBase;
@@ -285,8 +285,8 @@ mod tests {
     use std::marker::PhantomData;
 
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
     use plonky2_field::goldilocks_field::GoldilocksField;
+    use plonky2_field::types::Field;
     use plonky2_util::log2_ceil;
     use rand::Rng;
 

plonky2/src/gates/gate.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 
 use plonky2_field::batch_util::batch_multiply_inplace;
 use plonky2_field::extension::{Extendable, FieldExtension};
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::gates::selectors::UNUSED_SELECTOR;
 use crate::gates::util::StridedConstraintConsumer;

plonky2/src/gates/gate_testing.rs

@@ -1,7 +1,7 @@
 use anyhow::{ensure, Result};
 use plonky2_field::extension::{Extendable, FieldExtension};
-use plonky2_field::field_types::Field;
 use plonky2_field::polynomial::{PolynomialCoeffs, PolynomialValues};
+use plonky2_field::types::Field;
 use plonky2_util::log2_ceil;
 
 use crate::gates::gate::Gate;

plonky2/src/gates/interpolation.rs

@@ -271,9 +271,9 @@ mod tests {
     use std::marker::PhantomData;
 
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
     use plonky2_field::goldilocks_field::GoldilocksField;
     use plonky2_field::polynomial::PolynomialCoeffs;
+    use plonky2_field::types::Field;
 
     use crate::gadgets::interpolation::InterpolationGate;
     use crate::gates::gate::Gate;

plonky2/src/gates/low_degree_interpolation.rs

@@ -3,9 +3,9 @@ use std::ops::Range;
 
 use plonky2_field::extension::algebra::PolynomialCoeffsAlgebra;
 use plonky2_field::extension::{Extendable, FieldExtension};
-use plonky2_field::field_types::Field;
 use plonky2_field::interpolation::interpolant;
 use plonky2_field::polynomial::PolynomialCoeffs;
+use plonky2_field::types::Field;
 
 use crate::gadgets::interpolation::InterpolationGate;
 use crate::gadgets::polynomial::PolynomialCoeffsExtAlgebraTarget;
@@ -383,9 +383,9 @@ impl<F: RichField + Extendable<D>, const D: usize> SimpleGenerator<F>
 mod tests {
     use anyhow::Result;
     use plonky2_field::extension::quadratic::QuadraticExtension;
-    use plonky2_field::field_types::Field;
     use plonky2_field::goldilocks_field::GoldilocksField;
     use plonky2_field::polynomial::PolynomialCoeffs;
+    use plonky2_field::types::Field;
 
     use crate::gadgets::interpolation::InterpolationGate;
     use crate::gates::gate::Gate;

plonky2/src/gates/poseidon.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::gates::gate::Gate;
 use crate::gates::poseidon_mds::PoseidonMdsGate;
@@ -506,8 +506,8 @@ impl<F: RichField + Extendable<D> + Poseidon, const D: usize> SimpleGenerator<F>
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
     use plonky2_field::goldilocks_field::GoldilocksField;
+    use plonky2_field::types::Field;
 
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::gates::poseidon::PoseidonGate;

plonky2/src/gates/poseidon_mds.rs

@@ -4,7 +4,7 @@ use std::ops::Range;
 use plonky2_field::extension::algebra::ExtensionAlgebra;
 use plonky2_field::extension::Extendable;
 use plonky2_field::extension::FieldExtension;
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::gates::gate::Gate;
 use crate::gates::util::StridedConstraintConsumer;

plonky2/src/gates/random_access.rs

@@ -2,8 +2,8 @@ use std::marker::PhantomData;
 
 use itertools::Itertools;
 use plonky2_field::extension::Extendable;
-use plonky2_field::field_types::Field;
 use plonky2_field::packed_field::PackedField;
+use plonky2_field::types::Field;
 
 use crate::gates::gate::Gate;
 use crate::gates::packed_util::PackedEvaluableBase;
@@ -361,8 +361,8 @@ mod tests {
     use std::marker::PhantomData;
 
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
     use plonky2_field::goldilocks_field::GoldilocksField;
+    use plonky2_field::types::Field;
     use rand::{thread_rng, Rng};
 
     use crate::gates::gate::Gate;

plonky2/src/hash/arch/x86_64/poseidon_goldilocks_avx2_bmi2.rs

@@ -2,7 +2,7 @@ use std::arch::asm;
 use std::arch::x86_64::*;
 use std::mem::size_of;
 
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 use plonky2_field::goldilocks_field::GoldilocksField;
 use plonky2_util::branch_hint;
 use static_assertions::const_assert;

plonky2/src/hash/hash_types.rs

@@ -1,5 +1,5 @@
-use plonky2_field::field_types::{Field, PrimeField64};
 use plonky2_field::goldilocks_field::GoldilocksField;
+use plonky2_field::types::{Field, PrimeField64};
 use rand::Rng;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 

plonky2/src/hash/merkle_proofs.rs

@@ -126,7 +126,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2_field::field_types::Field;
+    use plonky2_field::types::Field;
     use rand::{thread_rng, Rng};
 
     use super::*;

plonky2/src/hash/path_compression.rs

@@ -115,7 +115,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use plonky2_field::field_types::Field;
+    use plonky2_field::types::Field;
     use rand::{thread_rng, Rng};
 
     use super::*;

plonky2/src/hash/poseidon.rs

@@ -2,7 +2,7 @@
 //! https://eprint.iacr.org/2019/458.pdf
 
 use plonky2_field::extension::{Extendable, FieldExtension};
-use plonky2_field::field_types::{Field, PrimeField64};
+use plonky2_field::types::{Field, PrimeField64};
 use unroll::unroll_for_loops;
 
 use crate::gates::gate::Gate;
@@ -684,7 +684,7 @@ impl<F: RichField> AlgebraicHasher<F> for PoseidonHash {
 
 #[cfg(test)]
 pub(crate) mod test_helpers {
-    use plonky2_field::field_types::Field;
+    use plonky2_field::types::Field;
 
     use crate::hash::hashing::SPONGE_WIDTH;
     use crate::hash::poseidon::Poseidon;

plonky2/src/hash/poseidon_goldilocks.rs

@@ -271,9 +271,9 @@ impl Poseidon for GoldilocksField {
 
 #[cfg(test)]
 mod tests {
-    use plonky2_field::field_types::Field;
-    use plonky2_field::field_types::PrimeField64;
     use plonky2_field::goldilocks_field::GoldilocksField as F;
+    use plonky2_field::types::Field;
+    use plonky2_field::types::PrimeField64;
 
     use crate::hash::poseidon::test_helpers::{check_consistency, check_test_vectors};
 

plonky2/src/iop/challenger.rs

@@ -274,7 +274,7 @@ impl<F: RichField + Extendable<D>, H: AlgebraicHasher<F>, const D: usize>
 
 #[cfg(test)]
 mod tests {
-    use plonky2_field::field_types::Field;
+    use plonky2_field::types::Field;
 
     use crate::iop::challenger::{Challenger, RecursiveChallenger};
     use crate::iop::generator::generate_partial_witness;

plonky2/src/iop/ext_target.rs

@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use plonky2_field::extension::algebra::ExtensionAlgebra;
 use plonky2_field::extension::{Extendable, FieldExtension, OEF};
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::hash::hash_types::RichField;
 use crate::iop::target::Target;

plonky2/src/iop/generator.rs

@@ -2,7 +2,7 @@ use std::fmt::Debug;
 use std::marker::PhantomData;
 
 use plonky2_field::extension::{Extendable, FieldExtension};
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::hash::hash_types::{HashOut, HashOutTarget, RichField};
 use crate::iop::ext_target::ExtensionTarget;

plonky2/src/iop/witness.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use itertools::Itertools;
 use plonky2_field::extension::{Extendable, FieldExtension};
-use plonky2_field::field_types::Field;
+use plonky2_field::types::Field;
 
 use crate::fri::structure::{FriOpenings, FriOpeningsTarget};
 use crate::fri::witness_util::set_fri_proof_target;

plonky2/src/plonk/circuit_builder.rs

@@ -6,8 +6,8 @@ use log::{debug, info, Level};
 use plonky2_field::cosets::get_unique_coset_shifts;
 use plonky2_field::extension::{Extendable, FieldExtension};
 use plonky2_field::fft::fft_root_table;
-use plonky2_field::field_types::Field;
 use plonky2_field::polynomial::PolynomialValues;
+use plonky2_field::types::Field;
 use plonky2_util::{log2_ceil, log2_strict};
 
 use crate::fri::oracle::PolynomialBatch;

plonky2/src/plonk/circuit_data.rs

@@ -5,7 +5,7 @@ use anyhow::Result;
 use plonky2_field::extension::Extendable;
 use plonky2_field::fft::FftRootTable;
 
-use crate::field::field_types::Field;
+use crate::field::types::Field;
 use crate::fri::oracle::PolynomialBatch;
 use crate::fri::reduction_strategies::FriReductionStrategy;
 use crate::fri::structure::{

plonky2/src/plonk/permutation_argument.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use plonky2_field::field_types::Field;
 use plonky2_field::polynomial::PolynomialValues;
+use plonky2_field::types::Field;
 use rayon::prelude::*;
 
 use crate::iop::target::Target;