BoxedMontyForm: From conversions for (Const)MontyForm

src/modular/boxed_monty_form.rs

@@ -2,6 +2,7 @@
 
 mod add;
 mod cmp;
+mod from;
 mod invert;
 mod lincomb;
 mod mul;
@@ -10,7 +11,7 @@ mod pow;
 mod select;
 mod sub;
 
-use super::{MontyParams, Retrieve, div_by_2, reduction::montgomery_retrieve_inner};
+use super::{Retrieve, div_by_2, reduction::montgomery_retrieve_inner};
 use crate::{BoxedUint, Choice, Limb, Monty, Odd, U64, Word};
 use alloc::sync::Arc;
 use mul::BoxedMontyMultiplier;
@@ -135,27 +136,6 @@ impl BoxedMontyParams {
     }
 }
 
-impl<const LIMBS: usize> From<&MontyParams<LIMBS>> for BoxedMontyParams {
-    fn from(params: &MontyParams<LIMBS>) -> Self {
-        Self(
-            BoxedMontyParamsInner {
-                modulus: params.modulus.into(),
-                one: params.one.into(),
-                r2: params.r2.into(),
-                mod_inv: params.mod_inv,
-                mod_leading_zeros: params.mod_leading_zeros,
-            }
-            .into(),
-        )
-    }
-}
-
-impl<const LIMBS: usize> From<MontyParams<LIMBS>> for BoxedMontyParams {
-    fn from(params: MontyParams<LIMBS>) -> Self {
-        BoxedMontyParams::from(&params)
-    }
-}
-
 /// An integer in Montgomery form represented using heap-allocated limbs.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct BoxedMontyForm {

src/modular/boxed_monty_form/from.rs

@@ -0,0 +1,61 @@
+//! `From`-like conversions for [`BoxedMontyForm`] and [`BoxedMontyParams`].
+
+use super::{BoxedMontyForm, BoxedMontyParams, BoxedMontyParamsInner};
+use crate::modular::{ConstMontyForm, ConstMontyParams, MontyForm, MontyParams};
+
+impl<const LIMBS: usize, Params> From<ConstMontyForm<Params, LIMBS>> for BoxedMontyForm
+where
+    Params: ConstMontyParams<LIMBS>,
+{
+    fn from(input: ConstMontyForm<Params, LIMBS>) -> Self {
+        Self::from(&input)
+    }
+}
+
+impl<const LIMBS: usize, Params> From<&ConstMontyForm<Params, LIMBS>> for BoxedMontyForm
+where
+    Params: ConstMontyParams<LIMBS>,
+{
+    fn from(input: &ConstMontyForm<Params, LIMBS>) -> Self {
+        BoxedMontyForm {
+            montgomery_form: input.as_montgomery().into(),
+            params: Params::PARAMS.into(),
+        }
+    }
+}
+
+impl<const LIMBS: usize> From<MontyForm<LIMBS>> for BoxedMontyForm {
+    fn from(input: MontyForm<LIMBS>) -> Self {
+        Self::from(&input)
+    }
+}
+
+impl<const LIMBS: usize> From<&MontyForm<LIMBS>> for BoxedMontyForm {
+    fn from(input: &MontyForm<LIMBS>) -> Self {
+        BoxedMontyForm {
+            montgomery_form: input.as_montgomery().into(),
+            params: input.params().into(),
+        }
+    }
+}
+
+impl<const LIMBS: usize> From<&MontyParams<LIMBS>> for BoxedMontyParams {
+    fn from(params: &MontyParams<LIMBS>) -> Self {
+        Self(
+            BoxedMontyParamsInner {
+                modulus: params.modulus.into(),
+                one: params.one.into(),
+                r2: params.r2.into(),
+                mod_inv: params.mod_inv,
+                mod_leading_zeros: params.mod_leading_zeros,
+            }
+            .into(),
+        )
+    }
+}
+
+impl<const LIMBS: usize> From<MontyParams<LIMBS>> for BoxedMontyParams {
+    fn from(params: MontyParams<LIMBS>) -> Self {
+        BoxedMontyParams::from(&params)
+    }
+}