Fix

src/fields/mod.rs

@@ -22,7 +22,7 @@ pub mod fp;
 
 /// This module contains a generic implementation of "nonnative" prime field
 /// variables. It emulates `Fp` arithmetic using `Fq` operations, where `p != q`.
-pub mod nonnative;
+pub mod emulated_fp;
 
 /// This module contains a generic implementation of the degree-12 tower
 /// extension field. That is, it implements the R1CS equivalent of

src/groups/curves/short_weierstrass/mod.rs

@@ -7,7 +7,7 @@ use ark_relations::r1cs::{ConstraintSystemRef, Namespace, SynthesisError};
 use ark_std::{borrow::Borrow, marker::PhantomData, ops::Mul};
 use non_zero_affine::NonZeroAffineVar;
 
-use crate::fields::nonnative::EmulatedFpVar;
+use crate::fields::emulated_fp::EmulatedFpVar;
 use crate::{fields::fp::FpVar, prelude::*, ToConstraintFieldGadget, Vec};
 
 /// This module provides a generic implementation of G1 and G2 for
@@ -981,7 +981,7 @@ mod test_sw_curve {
     use crate::{
         alloc::AllocVar,
         eq::EqGadget,
-        fields::{fp::FpVar, nonnative::EmulatedFpVar},
+        fields::{emulated_fp::EmulatedFpVar, fp::FpVar},
         groups::{curves::short_weierstrass::ProjectiveVar, CurveVar},
         ToBitsGadget,
     };

src/groups/curves/twisted_edwards/mod.rs

@@ -8,7 +8,7 @@ use ark_ec::{
 use ark_ff::{BitIteratorBE, Field, One, PrimeField, Zero};
 use ark_relations::r1cs::{ConstraintSystemRef, Namespace, SynthesisError};
 
-use crate::fields::nonnative::EmulatedFpVar;
+use crate::fields::emulated_fp::EmulatedFpVar;
 use crate::{prelude::*, ToConstraintFieldGadget, Vec};
 
 use crate::fields::fp::FpVar;

src/groups/mod.rs

@@ -1,4 +1,4 @@
-use crate::{fields::nonnative::EmulatedFpVar, prelude::*};
+use crate::{fields::emulated_fp::EmulatedFpVar, prelude::*};
 use ark_ff::PrimeField;
 use ark_relations::r1cs::{Namespace, SynthesisError};
 use core::ops::{Add, AddAssign, Mul, MulAssign, Sub, SubAssign};

src/pairing/mod.rs

@@ -25,7 +25,7 @@ pub trait PairingVar<E: Pairing> {
 
     /// An variable representing an element of `GT`.
     /// This is the R1CS equivalent of `E::GT`.
-    type GTVar: FieldVar<E::TargetF, BasePrimeField<E>>;
+    type GTVar: FieldVar<E::TargetField, BasePrimeField<E>>;
 
     /// An variable representing cached precomputation  that can speed up
     /// pairings computations. This is the R1CS equivalent of

tests/arithmetic_tests.rs

@@ -10,7 +10,7 @@ use ark_r1cs_std::{
     alloc::AllocVar,
     eq::EqGadget,
     fields::{
-        nonnative::{AllocatedEmulatedFpVar, EmulatedFpVar},
+        emulated_fp::{AllocatedEmulatedFpVar, EmulatedFpVar},
         FieldVar,
     },
     R1CSVar,

tests/from_test.rs

@@ -1,6 +1,6 @@
 use ark_r1cs_std::{
     alloc::AllocVar,
-    fields::nonnative::{EmulatedFpVar, MulResultVar},
+    fields::emulated_fp::{EmulatedFpVar, MulResultVar},
     R1CSVar,
 };
 use ark_relations::r1cs::ConstraintSystem;

tests/to_constraint_field_test.rs

@@ -1,5 +1,5 @@
 use ark_r1cs_std::{
-    alloc::AllocVar, fields::nonnative::EmulatedFpVar, R1CSVar, ToConstraintFieldGadget,
+    alloc::AllocVar, fields::emulated_fp::EmulatedFpVar, R1CSVar, ToConstraintFieldGadget,
 };
 use ark_relations::r1cs::ConstraintSystem;