refactor: add trailing comma to multiline derives

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
rust-osdev · Oct 13, 2024 · ebc29bc · ebc29bc
1 parent c7d8e78
commit ebc29bc
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 137 deletions.
diff --git a/bindgen.sh b/bindgen.sh
@@ -11,8 +11,8 @@ gen() {
         --with-derive-hash \
         --with-derive-partialeq \
         --with-derive-eq \
-        --with-attribute-custom-enum '.*=#[cfg_attr(feature = "num_enum", derive(num_enum::IntoPrimitive,num_enum::TryFromPrimitive,num_enum::UnsafeFromPrimitive))]' \
-        --with-attribute-custom-struct '.*=#[cfg_attr(feature = "zerocopy", derive(zerocopy_derive::FromZeroes,zerocopy_derive::FromBytes,zerocopy_derive::AsBytes))]' \
+        --with-attribute-custom-enum '.*=#[cfg_attr(feature = "num_enum", derive(num_enum::IntoPrimitive,num_enum::TryFromPrimitive,num_enum::UnsafeFromPrimitive,))]' \
+        --with-attribute-custom-struct '.*=#[cfg_attr(feature = "zerocopy", derive(zerocopy_derive::FromZeroes,zerocopy_derive::FromBytes,zerocopy_derive::AsBytes,))]' \
         "$@"
 }
 

diff --git a/patches/0001-fix-add-zerocopy-support-for-__IncompleteArrayField.patch b/patches/0001-fix-add-zerocopy-support-for-__IncompleteArrayField.patch
@@ -12,7 +12,7 @@ diff --git a/src/linux.rs b/src/linux.rs
 +    derive(
 +        zerocopy_derive::FromZeroes,
 +        zerocopy_derive::FromBytes,
-+        zerocopy_derive::AsBytes
++        zerocopy_derive::AsBytes,
 +    )
 +)]
  pub struct __IncompleteArrayField<T>(::core::marker::PhantomData<T>, [T; 0]);
@@ -32,7 +32,7 @@ diff --git a/src/macos.rs b/src/macos.rs
 +    derive(
 +        zerocopy_derive::FromZeroes,
 +        zerocopy_derive::FromBytes,
-+        zerocopy_derive::AsBytes
++        zerocopy_derive::AsBytes,
 +    )
 +)]
  pub struct __IncompleteArrayField<T>(::core::marker::PhantomData<T>, [T; 0]);