Rename make_serde to impl_struct_serde_conversion (same as in amd-apcb).

Author: daym

Cargo.toml

@@ -28,7 +28,6 @@ strum_macros = { version = "0.23.1" }
 zerocopy = "0.6"
 thiserror = { version = "1.0.38", optional = true }
 memoffset = "0.5"
-quote = { version = "1.0.33", default-features = false, features = [] }
 
 [features]
 default = []

src/ondisk.rs

@@ -749,15 +749,17 @@ macro_rules! make_bitfield_serde {(
         }
     }
 
-    // for serde
     #[cfg(feature = "serde")]
     paste::paste!{
+        /// Use this for serialization in order to make serde skip those fields
+        /// where the meaning of a raw value is unknown to us.
+        ///
+        /// Caller can then override Serializer::skip_field and thus find out
+        /// which fields were skipped, inferring where errors were.
         #[doc(hidden)]
         #[allow(non_camel_case_types)]
         #[cfg_attr(feature = "serde", derive(serde::Serialize))]
-        //#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
         #[cfg_attr(feature = "serde", serde(rename = "" $StructName))]
-        //#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
         pub(crate) struct [<SerdePermissiveSerializing $StructName>] {
             $(
                 $(#[serde(skip_serializing_if="Option::is_none")] pub $field_name: Option<$field_ty>,)?

src/serializers.rs

@@ -6,10 +6,9 @@
 #![cfg(feature = "serde")]
 
 use crate::ondisk::*;
-//use quote::quote;
 
 // Note: This is written such that it will fail if the underlying struct has fields added/removed/renamed--if those have a public setter.
-macro_rules! make_serde{($StructName:ident, $SerdeStructName:ident, $SerializingStructName:ident, [$($field_name:ident),* $(,)?]
+macro_rules! impl_struct_serde_conversion{($StructName:ident, $SerdeStructName:ident, $SerializingStructName:ident, [$($field_name:ident),* $(,)?]
 ) => (
     paste::paste!{
         #[cfg(feature = "serde")]
@@ -49,13 +48,13 @@ macro_rules! make_serde{($StructName:ident, $SerdeStructName:ident, $Serializing
     }
 )}
 
-make_serde!(
+impl_struct_serde_conversion!(
     DirectoryAdditionalInfo,
     SerdeDirectoryAdditionalInfo,
     SerdePermissiveSerializingDirectoryAdditionalInfo,
     [max_size, spi_block_size, base_address, address_mode, _reserved_0,]
 );
-make_serde!(
+impl_struct_serde_conversion!(
     PspSoftFuseChain,
     SerdePspSoftFuseChain,
     SerdePermissiveSerializingPspSoftFuseChain,

src/struct_accessors.rs

@@ -311,16 +311,23 @@ macro_rules! make_accessors {(
             )?
         )*
     }
-    // for serde
     #[cfg(feature = "serde")]
     paste::paste!{
+        /// Use this for serialization in order to make serde skip those fields
+        /// where the meaning of a raw value is unknown to us.
+        ///
+        /// Caller can then override Serializer::skip_field and thus find out
+        /// which fields were skipped, inferring where errors were.
         #[doc(hidden)]
         #[allow(non_camel_case_types)]
         #[cfg_attr(feature = "serde", derive(serde::Serialize))]
         //#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
         #[cfg_attr(feature = "serde", serde(rename = "" $StructName))]
         //#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
         // Rust's serde automatically has Options transparent--but not Results.
+        // See also <https://github.com/serde-rs/serde/issues/1042> for
+        // limitations (that don't hit us since our zerocopy structs
+        // can't have Option<Option<T>> anyway).
         pub(crate) struct [<SerdePermissiveSerializing $StructName>] {
             $(
                 $(#[serde(skip_serializing_if="Option::is_none")] pub $field_name: Option<$field_ty>,)?