Small fixups to reduce diff.

This commit is contained in:
Sean Bowe 2017-07-18 09:00:02 -06:00
parent 0e877810f7
commit 19efad5ba6
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
4 changed files with 6 additions and 6 deletions

View File

@ -27,7 +27,7 @@ macro_rules! curve_impl {
} }
} }
#[derive(Copy, Clone, Eq, Debug)] #[derive(Copy, Clone, Debug, Eq)]
pub struct $projective { pub struct $projective {
pub(crate) x: $basefield, pub(crate) x: $basefield,
pub(crate) y: $basefield, pub(crate) y: $basefield,
@ -577,7 +577,7 @@ pub mod g1 {
use super::super::{Fq, Fr, FrRepr, FqRepr}; use super::super::{Fq, Fr, FrRepr, FqRepr};
use ::{CurveProjective, CurveAffine, PrimeField, SqrtField, PrimeFieldRepr, Field, BitIterator, EncodedPoint, GroupDecodingError}; use ::{CurveProjective, CurveAffine, PrimeField, SqrtField, PrimeFieldRepr, Field, BitIterator, EncodedPoint, GroupDecodingError};
curve_impl!("E", G1, G1Affine, G1Prepared, Fq, Fr, G1Uncompressed, G1Compressed); curve_impl!("G1", G1, G1Affine, G1Prepared, Fq, Fr, G1Uncompressed, G1Compressed);
#[derive(Copy)] #[derive(Copy)]
pub struct G1Uncompressed([u8; 96]); pub struct G1Uncompressed([u8; 96]);
@ -1125,7 +1125,7 @@ pub mod g2 {
use super::super::{Fq2, Fr, Fq, FrRepr, FqRepr}; use super::super::{Fq2, Fr, Fq, FrRepr, FqRepr};
use ::{CurveProjective, CurveAffine, PrimeField, SqrtField, PrimeFieldRepr, Field, BitIterator, EncodedPoint, GroupDecodingError}; use ::{CurveProjective, CurveAffine, PrimeField, SqrtField, PrimeFieldRepr, Field, BitIterator, EncodedPoint, GroupDecodingError};
curve_impl!("E'", G2, G2Affine, G2Prepared, Fq2, Fr, G2Uncompressed, G2Compressed); curve_impl!("G2", G2, G2Affine, G2Prepared, Fq2, Fr, G2Uncompressed, G2Compressed);
#[derive(Copy)] #[derive(Copy)]
pub struct G2Uncompressed([u8; 192]); pub struct G2Uncompressed([u8; 192]);

View File

@ -5,7 +5,7 @@ use super::fq2::Fq2;
use super::fq::{FROBENIUS_COEFF_FQ12_C1}; use super::fq::{FROBENIUS_COEFF_FQ12_C1};
/// An element of Fq12, represented by c0 + c1 * w. /// An element of Fq12, represented by c0 + c1 * w.
#[derive(Copy, Clone, Eq, PartialEq, Debug)] #[derive(Copy, Clone, Debug, Eq, PartialEq)]
pub struct Fq12 { pub struct Fq12 {
pub c0: Fq6, pub c0: Fq6,
pub c1: Fq6 pub c1: Fq6

View File

@ -5,7 +5,7 @@ use super::fq::{Fq, FROBENIUS_COEFF_FQ2_C1, NEGATIVE_ONE};
use std::cmp::Ordering; use std::cmp::Ordering;
/// An element of Fq2, represented by c0 + c1 * u. /// An element of Fq2, represented by c0 + c1 * u.
#[derive(Copy, Clone, Eq, PartialEq, Debug)] #[derive(Copy, Clone, Debug, Eq, PartialEq)]
pub struct Fq2 { pub struct Fq2 {
pub c0: Fq, pub c0: Fq,
pub c1: Fq pub c1: Fq

View File

@ -4,7 +4,7 @@ use super::fq2::Fq2;
use super::fq::{FROBENIUS_COEFF_FQ6_C1, FROBENIUS_COEFF_FQ6_C2}; use super::fq::{FROBENIUS_COEFF_FQ6_C1, FROBENIUS_COEFF_FQ6_C2};
/// An element of Fq6, represented by c0 + c1 * v + c2 * v^2. /// An element of Fq6, represented by c0 + c1 * v + c2 * v^2.
#[derive(Copy, Clone, Eq, PartialEq, Debug)] #[derive(Copy, Clone, Debug, Eq, PartialEq)]
pub struct Fq6 { pub struct Fq6 {
pub c0: Fq2, pub c0: Fq2,
pub c1: Fq2, pub c1: Fq2,