Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion src/field.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,41 @@ where
}
}

/// The trait combines all `FromWithConfig<u*>` and `FromWithConfig<i*>` into
/// one umbrella trait. Handy when one needs conversion functions for different
/// primitive int types.
pub trait FromPrimitiveWithConfig:
FromWithConfig<u8>
+ FromWithConfig<u16>
+ FromWithConfig<u32>
+ FromWithConfig<u64>
+ FromWithConfig<u128>
+ FromWithConfig<i8>
+ FromWithConfig<i16>
+ FromWithConfig<i32>
+ FromWithConfig<i64>
+ FromWithConfig<i128>
{
}

/// Blanket implementation.
impl<
T: FromWithConfig<u8>
+ FromWithConfig<u16>
+ FromWithConfig<u32>
+ FromWithConfig<u64>
+ FromWithConfig<u128>
+ FromWithConfig<i8>
+ FromWithConfig<i16>
+ FromWithConfig<i32>
+ FromWithConfig<i64>
+ FromWithConfig<i128>,
> FromPrimitiveWithConfig for T
{
}

/// Analogous to `Into` trait, but with a prime field configuration parameter.
/// Preferribly should not be implemented directly.
/// Preferably should not be implemented directly.
pub trait IntoWithConfig<F: PrimeField> {
fn into_with_cfg(self, cfg: &F::Config) -> F;
}
Expand Down
1 change: 1 addition & 0 deletions src/field/ark_ff_fp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,7 @@ mod tests {
#[test]
fn ensure_blanket_traits() {
ensure_type_implements_trait!(F, ConstIntRing);
ensure_type_implements_trait!(F, FromPrimitiveWithConfig);
}

#[test]
Expand Down
7 changes: 7 additions & 0 deletions src/field/crypto_bigint_boxed_monty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,12 +472,19 @@ impl PrimeField for BoxedMontyField {
#[cfg(test)]
mod tests {
use super::*;
use crate::ensure_type_implements_trait;
use alloc::vec;
use crypto_bigint::BoxedUint;
use num_traits::Pow;

type F = BoxedMontyField;

#[test]
fn ensure_blanket_traits() {
// NB: this ensures `PrimeField` implementation too!
ensure_type_implements_trait!(F, FromPrimitiveWithConfig);
}

//
// Test helpers
//
Expand Down
3 changes: 2 additions & 1 deletion src/field/crypto_bigint_const_monty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,8 @@ mod tests {

#[test]
fn ensure_blanket_traits() {
ensure_type_implements_trait!(F, PrimeField);
// NB: this ensures `PrimeField` implementation too!
ensure_type_implements_trait!(F, FromPrimitiveWithConfig);
}

#[test]
Expand Down
3 changes: 2 additions & 1 deletion src/field/crypto_bigint_monty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,8 @@ mod tests {

#[test]
fn ensure_blanket_traits() {
ensure_type_implements_trait!(F, PrimeField);
// NB: this ensures `PrimeField` implementation too!
ensure_type_implements_trait!(F, FromPrimitiveWithConfig);
}

#[test]
Expand Down