Move ConstraintVar to r1cs-core

r1cs-std/src/fields/fp.rs

@@ -1,20 +1,12 @@
 use algebra::{bytes::ToBytes, FpParameters, PrimeField};
-use r1cs_core::{ConstraintSystem, LinearCombination, SynthesisError};
+use r1cs_core::{ConstraintSystem, LinearCombination, SynthesisError, ConstraintVar::{self, *}};
 
 use std::borrow::Borrow;
 
-use super::FieldGadget;
-use crate::{
-    boolean::{AllocatedBit, Boolean},
-    uint8::UInt8,
-};
-
+use crate::boolean::AllocatedBit;
+use crate::Assignment;
 use crate::prelude::*;
 
-use crate::{
-    Assignment,
-    ConstraintVar::{self, *},
-};
 
 #[derive(Debug)]
 pub struct FpGadget<F: PrimeField> {

r1cs-std/src/fields/fp2.rs

@@ -2,12 +2,12 @@ use algebra::{
     fields::{Fp2, Fp2Parameters},
     Field, PrimeField,
 };
-use r1cs_core::{ConstraintSystem, SynthesisError};
+use r1cs_core::{ConstraintSystem, SynthesisError, ConstraintVar};
 use std::{borrow::Borrow, marker::PhantomData};
 
 use crate::fields::fp::FpGadget;
 use crate::prelude::*;
-use crate::{Assignment, ConstraintVar};
+use crate::Assignment;
 
 #[derive(Derivative)]
 #[derivative(Debug(bound = "P: Fp2Parameters, ConstraintF: PrimeField"))]

r1cs-std/src/fields/fp6_3over2.rs

@@ -5,11 +5,10 @@ use algebra::{
     },
     PrimeField,
 };
-use r1cs_core::{ConstraintSystem, SynthesisError};
+use r1cs_core::{ConstraintSystem, SynthesisError, ConstraintVar};
 use std::{borrow::Borrow, marker::PhantomData};
 
 use crate::prelude::*;
-use crate::ConstraintVar;
 use crate::Assignment;
 
 type Fp2Gadget<P, ConstraintF> = super::fp2::Fp2Gadget<<P as Fp6Parameters>::Fp2Params, ConstraintF>;