Terrible, but compatible.

Author: daym

ahib-config/src/lib.rs

@@ -109,13 +109,12 @@ impl TryFromSerdeDirectoryEntryWithContext<SerdePspDirectoryEntry>
 }
 
 // See <https://github.com/serde-rs/serde/issues/1799>
-#[derive(Clone, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
+#[derive(Clone, serde::Serialize, schemars::JsonSchema)]
 #[serde(rename = "SerdePspEntrySourceValue")]
 #[serde(deny_unknown_fields)]
+#[non_exhaustive]
 pub enum SerdePspEntrySourceValue {
     PspSoftFuseChain(PspSoftFuseChain),
-    #[serde(default)]
-    Raw(u64),
 }
 
 impl SerdePspEntrySourceValue {
@@ -143,6 +142,62 @@ impl SerdePspEntrySourceValue {
     }
 }
 
+impl<'de> serde::Deserialize<'de> for SerdePspEntrySourceValue {
+    fn deserialize<D: serde::Deserializer<'de>>(
+        deserializer: D,
+    ) -> std::result::Result<Self, D::Error> {
+        // rest delegate to PspSoftFuseChain, if that makes sense.
+        struct ModeVisitor;
+        impl<'de> serde::de::Visitor<'de> for ModeVisitor {
+            type Value = SerdePspEntrySourceValue;
+            fn expecting(
+                &self,
+                formatter: &mut core::fmt::Formatter<'_>,
+            ) -> core::fmt::Result {
+                formatter.write_str("'Disabled', 'Enabled', 0 or 1")
+            }
+            fn visit_map<A>(
+                self,
+                map: A,
+            ) -> std::result::Result<Self::Value, A::Error>
+            where
+                A: serde::de::MapAccess<'de>,
+            {
+                // Delegate to PspSoftFuseChain's deserializer
+                let chain = PspSoftFuseChain::deserialize(
+                    serde::de::value::MapAccessDeserializer::new(map),
+                )?;
+                Ok(SerdePspEntrySourceValue::PspSoftFuseChain(chain))
+            }
+
+            fn visit_i64<E: serde::de::Error>(
+                self,
+                value: i64,
+            ) -> core::result::Result<Self::Value, E> {
+                if value >= 0 {
+                    Ok(SerdePspEntrySourceValue::PspSoftFuseChain(
+                        PspSoftFuseChain::from(value as u64),
+                    ))
+                } else {
+                    Err(E::invalid_value(
+                        serde::de::Unexpected::Signed(value),
+                        &"a positive integer or PspSoftFuseChain",
+                    ))
+                }
+            }
+            fn visit_u64<E: serde::de::Error>(
+                self,
+                value: u64,
+            ) -> core::result::Result<Self::Value, E> {
+                Ok(SerdePspEntrySourceValue::PspSoftFuseChain(
+                    PspSoftFuseChain::from(value),
+                ))
+            }
+        }
+        deserializer.deserialize_any(ModeVisitor)
+    }
+}
+
 #[derive(Clone, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
 #[serde(rename = "PspEntrySource")]
 #[serde(deny_unknown_fields)]