feat: Add JsonSerialize and ValueDeserialize impls for f32, f64

Author: fasterthanlime

merde_core/src/deserialize.rs

@@ -229,6 +229,34 @@ impl<'s> ValueDeserialize<'s> for isize {
     }
 }
 
+impl<'s> ValueDeserialize<'s> for f32 {
+    fn from_value_ref<'val>(value: Option<&'val Value<'s>>) -> Result<Self, MerdeError> {
+        match value {
+            Some(Value::Float(f)) => Ok(*f as f32),
+            Some(Value::Int(i)) => Ok(*i as f32),
+            Some(v) => Err(MerdeError::MismatchedType {
+                expected: ValueType::Float,
+                found: v.value_type(),
+            }),
+            None => Err(MerdeError::MissingValue),
+        }
+    }
+}
+
+impl<'s> ValueDeserialize<'s> for f64 {
+    fn from_value_ref<'val>(value: Option<&'val Value<'s>>) -> Result<Self, MerdeError> {
+        match value {
+            Some(Value::Float(f)) => Ok(*f),
+            Some(Value::Int(i)) => Ok(*i as f64),
+            Some(v) => Err(MerdeError::MismatchedType {
+                expected: ValueType::Float,
+                found: v.value_type(),
+            }),
+            None => Err(MerdeError::MissingValue),
+        }
+    }
+}
+
 impl<'s> ValueDeserialize<'s> for bool {
     fn from_value_ref<'val>(value: Option<&'val Value<'s>>) -> Result<Self, MerdeError> {
         match value {

merde_core/src/into_static.rs

@@ -49,7 +49,7 @@ macro_rules! impl_into_static_passthru {
 }
 
 impl_into_static_passthru!(
-    String, u128, u64, u32, u16, u8, i128, i64, i32, i16, i8, bool, char, f32, f64, usize, isize
+    String, u128, u64, u32, u16, u8, i128, i64, i32, i16, i8, bool, char, usize, isize, f32, f64
 );
 
 impl<T: IntoStatic> IntoStatic for Option<T> {

merde_core/src/with_lifetime.rs

@@ -59,10 +59,10 @@ impl_with_lifetime!(
     i8,
     bool,
     char,
-    f32,
-    f64,
     usize,
     isize,
+    f32,
+    f64,
 );
 
 impl<'s> WithLifetime<'s> for () {

merde_json/src/lib.rs

@@ -325,6 +325,18 @@ impl JsonSerialize for isize {
     }
 }
 
+impl JsonSerialize for f32 {
+    fn json_serialize(&self, serializer: &mut JsonSerializer) {
+        serializer.write_f64(*self as f64);
+    }
+}
+
+impl JsonSerialize for f64 {
+    fn json_serialize(&self, serializer: &mut JsonSerializer) {
+        serializer.write_f64(*self);
+    }
+}
+
 impl JsonSerialize for bool {
     fn json_serialize(&self, serializer: &mut JsonSerializer) {
         serializer.write_bool(*self);