fix: generalize from_types macro

nfejzic · Nov 20, 2023 · e917f5d · e917f5d
1 parent c0ce1b0
commit e917f5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/elements/mn.rs b/src/elements/mn.rs
@@ -18,7 +18,8 @@ impl<'a> From<&'a str> for Num {
     }
 }
 
-crate::from_types!(u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize);
+crate::from_types!(u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize => Num;
+            |val| Num { num: format!("{}", val), attributes: Default::default() });
 
 impl<T> From<T> for MathMl
 where

diff --git a/src/lib.rs b/src/lib.rs
@@ -4,6 +4,8 @@ pub mod attributes;
 pub mod elements;
 pub mod markers;
 
+use elements::Num;
+
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) enum Tag {
     Num(Num),
@@ -16,19 +18,16 @@ pub struct MathMl {
 }
 
 macro_rules! from_types {
-    ($($type:ty),* $(,)?) => {
+    ($($type:path),* $(,)? => $for_type:path; $func:expr) => {
         $(
-        impl From<$type> for Num {
+        impl From<$type> for $for_type {
             fn from(value: $type) -> Self {
-                Self {
-                    num: format!("{}", value),
-                    attributes: Vec::default(),
-                }
+                let from_value = $func;
+                from_value(value)
             }
         }
         )*
     };
 }
 
-use elements::Num;
 pub(crate) use from_types;