Fix review comments

Author: azerupi

mavlink-bindgen/src/parser.rs

@@ -710,7 +710,7 @@ impl MavMessage {
                     quote!()
                 };
 
-                let serde_with_attr = if matches!(field.mavtype, MavType::Array(_, _)) {
+                let serde_with_attr = if matches!(field.mavtype, MavType::Array(_, _) | MavType::CharArray(_)) {
                     quote!(
                         #[cfg_attr(feature = "serde", serde(with = "serde_arrays"))]
                         #[cfg_attr(feature = "ts", ts(type = "Array<number>"))]

mavlink-bindgen/tests/snapshots/[email protected]

@@ -1,6 +1,5 @@
 ---
 source: mavlink-bindgen/tests/e2e_snapshots.rs
-assertion_line: 26
 expression: contents
 ---
 #![doc = "MAVLink deprecated dialect."]
@@ -11,7 +10,9 @@ expression: contents
 use arbitrary::Arbitrary;
 #[allow(unused_imports)]
 use bitflags::bitflags;
-use mavlink_core::{bytes::Bytes, bytes_mut::BytesMut, MavlinkVersion, Message, MessageData};
+use mavlink_core::{
+    bytes::Bytes, bytes_mut::BytesMut, types::CharArray, MavlinkVersion, Message, MessageData,
+};
 #[allow(unused_imports)]
 use num_derive::FromPrimitive;
 #[allow(unused_imports)]

mavlink-bindgen/tests/snapshots/e2e_snapshots__no_field_description.xml@no_field_description.rs.snap

@@ -1,6 +1,5 @@
 ---
 source: mavlink-bindgen/tests/e2e_snapshots.rs
-assertion_line: 26
 expression: contents
 ---
 #![doc = "MAVLink no_field_description dialect."]
@@ -11,7 +10,9 @@ expression: contents
 use arbitrary::Arbitrary;
 #[allow(unused_imports)]
 use bitflags::bitflags;
-use mavlink_core::{bytes::Bytes, bytes_mut::BytesMut, MavlinkVersion, Message, MessageData};
+use mavlink_core::{
+    bytes::Bytes, bytes_mut::BytesMut, types::CharArray, MavlinkVersion, Message, MessageData,
+};
 #[allow(unused_imports)]
 use num_derive::FromPrimitive;
 #[allow(unused_imports)]

mavlink-core/src/types.rs

@@ -20,9 +20,9 @@ use arbitrary::{Arbitrary, Unstructured};
 /// let ca = CharArray::new(data);
 /// assert_eq!(ca.to_str(), "HELLO");
 /// ```
-#[derive(Debug, PartialEq, Clone, Copy)]
 #[cfg_attr(feature = "serde", derive(Serialize))]
 #[cfg_attr(feature = "serde", serde(transparent))]
+#[derive(Debug, PartialEq, Clone, Copy)]
 pub struct CharArray<const N: usize> {
     #[cfg_attr(feature = "serde", serde(with = "serde_arrays"))]
     data: [u8; N],
@@ -56,8 +56,8 @@ impl<const N: usize> CharArray<N> {
     /// Get the string representation of the char array.
     /// Returns the string stopping at the first null byte and if the string is not valid utf8
     /// the returned string will be empty.
-    pub fn to_str(&self) -> &str {
-        core::str::from_utf8(&self.data[..self.str_len]).unwrap_or("")
+    pub fn to_str(&self) -> Result<&str, core::str::Utf8Error> {
+        core::str::from_utf8(&self.data[..self.str_len])
     }
 }
 
@@ -132,7 +132,7 @@ mod tests {
         let data = *b"HELLOWORLD";
         let ca = CharArray::new(data);
         assert_eq!(ca.len(), 10);
-        assert_eq!(ca.to_str(), "HELLOWORLD");
+        assert_eq!(ca.to_str().unwrap(), "HELLOWORLD");
     }
 
     #[test]
@@ -142,6 +142,6 @@ mod tests {
         // data[3..] are zeros
         let ca = CharArray::new(data);
         assert_eq!(ca.len(), 10);
-        assert_eq!(ca.to_str(), "abc");
+        assert_eq!(ca.to_str().unwrap(), "abc");
     }
 }