From a74527fe9ab4d5d5d9c773a2556eabfb9107d6c3 Mon Sep 17 00:00:00 2001
From: Markus Barenhoff <markus.barenhoff@multivac.de>
Date: Tue, 12 Dec 2023 07:36:57 +0100
Subject: [PATCH] Derive FromZeroes & FromBytes for Strings

---
 src/strings.rs | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/strings.rs b/src/strings.rs
index 4e94a85..1ce459a 100644
--- a/src/strings.rs
+++ b/src/strings.rs
@@ -1,5 +1,7 @@
 //! Const-generic string types for representing fixed-length strings.
 
+use zerocopy::{FromBytes, FromZeroes};
+
 /// Represents a fixed-length byte string.
 ///
 /// This type can be created from a `&str` or `&[u8]` if their byte
@@ -10,7 +12,7 @@
 ///
 /// It can be converted to a Rust `String` if it is UTF8 encoded.
 #[repr(C)]
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, FromBytes, FromZeroes)]
 pub struct String<const LEN: usize>([u8; LEN], u8);  // one extra NULL byte
 
 impl<const LEN: usize> String<LEN> {
@@ -128,14 +130,6 @@ unsafe impl<const LEN: usize> zerocopy::AsBytes for String<LEN> {
     fn only_derive_is_allowed_to_implement_this_trait() { }
 }
 
-unsafe impl<const LEN: usize> zerocopy::FromZeroes for String<LEN> {
-    fn only_derive_is_allowed_to_implement_this_trait() { }
-}
-
-unsafe impl<const LEN: usize> zerocopy::FromBytes for String<LEN> {
-    fn only_derive_is_allowed_to_implement_this_trait() { }
-}
-
 /// Represents a fixed-length wide string.
 ///
 /// This type can be created from a `&[u16]` if its length does not
@@ -148,7 +142,7 @@ unsafe impl<const LEN: usize> zerocopy::FromBytes for String<LEN> {
 /// It can be converted to a Rust `String` if it is properly UTF16
 /// encoded.
 #[repr(C)]
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, FromBytes, FromZeroes)]
 pub struct WString<const LEN: usize>([u16; LEN], u16);  // one extra NULL byte
 
 impl<const LEN: usize> WString<LEN> {
@@ -275,14 +269,6 @@ unsafe impl<const LEN: usize> zerocopy::AsBytes for WString<LEN> {
     fn only_derive_is_allowed_to_implement_this_trait() { }
 }
 
-unsafe impl<const LEN: usize> zerocopy::FromZeroes for WString<LEN> {
-    fn only_derive_is_allowed_to_implement_this_trait() { }
-}
-
-unsafe impl<const LEN: usize> zerocopy::FromBytes for WString<LEN> {
-    fn only_derive_is_allowed_to_implement_this_trait() { }
-}
-
 // compatibility aliases
 
 /// Alias for `String<80>`.