Revert "String parsing for char[]" (#376)

* Revert "String parsing for char[] (#343)"

This reverts commit aeac5d9.

* mavlink: tests: Update test to match current char[] behavior

Author: joaoantoniocardoso

mavlink-bindgen/src/parser.rs

@@ -567,7 +567,7 @@ impl MavMessage {
                 // If sent by an implementation that doesn't have the extensions fields
                 // then the recipient will see zero values for the extensions fields.
                 let serde_default = if field.is_extension {
-                    if field.enumtype.is_some() || matches!(field.mavtype, MavType::String(_)) {
+                    if field.enumtype.is_some() {
                         quote!(#[cfg_attr(feature = "serde", serde(default))])
                     } else {
                         quote!(#[cfg_attr(feature = "serde", serde(default = "crate::RustDefault::rust_default"))])
@@ -928,7 +928,6 @@ pub enum MavType {
     Char,
     Float,
     Double,
-    String(usize),
     Array(Box<MavType>, usize),
 }
 
@@ -954,11 +953,7 @@ impl MavType {
                     let start = s.find('[')?;
                     let size = s[start + 1..(s.len() - 1)].parse::<usize>().ok()?;
                     let mtype = Self::parse_type(&s[0..start])?;
-                    if mtype == Char {
-                        Some(String(size))
-                    } else {
-                        Some(Array(Box::new(mtype), size))
-                    }
+                    Some(Array(Box::new(mtype), size))
                 } else {
                     None
                 }
@@ -982,19 +977,7 @@ impl MavType {
             Int64 => quote! {#val = #buf.get_i64_le();},
             Float => quote! {#val = #buf.get_f32_le();},
             Double => quote! {#val = #buf.get_f64_le();},
-            String(size) => {
-                let r = Char.rust_reader(&quote!(let next_char), buf);
-                quote! {
-                    for _ in 0..#size {
-                        #r
-                        if next_char == 0 {
-                            break;
-                        }
-                        #val.push(next_char as char);
-                    }
-                }
-            }
-            Array(t, _size) => {
+            Array(t, _) => {
                 let r = t.rust_reader(&quote!(let val), buf);
                 quote! {
                     for v in &mut #val {
@@ -1022,15 +1005,6 @@ impl MavType {
             UInt64 => quote! {#buf.put_u64_le(#val);},
             Int64 => quote! {#buf.put_i64_le(#val);},
             Double => quote! {#buf.put_f64_le(#val);},
-            String(_size) => {
-                let w = Char.rust_writer(&quote!(*val), buf);
-                quote! {
-                    let slice = #val.as_bytes();
-                    for val in slice {
-                        #w
-                    }
-                }
-            }
             Array(t, _size) => {
                 let w = t.rust_writer(&quote!(*val), buf);
                 quote! {
@@ -1050,7 +1024,6 @@ impl MavType {
             UInt16 | Int16 => 2,
             UInt32 | Int32 | Float => 4,
             UInt64 | Int64 | Double => 8,
-            String(size) => Char.len() * size,
             Array(t, size) => t.len() * size,
         }
     }
@@ -1063,7 +1036,6 @@ impl MavType {
             UInt16 | Int16 => 2,
             UInt32 | Int32 | Float => 4,
             UInt64 | Int64 | Double => 8,
-            String(_) => Char.len(),
             Array(t, _) => t.len(),
         }
     }
@@ -1084,7 +1056,6 @@ impl MavType {
             UInt64 => "uint64_t".into(),
             Int64 => "int64_t".into(),
             Double => "double".into(),
-            String(_) => "char".into(),
             Array(t, _) => t.primitive_type(),
         }
     }
@@ -1105,7 +1076,6 @@ impl MavType {
             UInt64 => "u64".into(),
             Int64 => "i64".into(),
             Double => "f64".into(),
-            String(size) => format!("arrayvec::ArrayString<{size}>"),
             Array(t, size) => format!("[{};{}]", t.rust_type(), size),
         }
     }
@@ -1124,7 +1094,6 @@ impl MavType {
             UInt64 => quote!(0_u64),
             Int64 => quote!(0_i64),
             Double => quote!(0.0_f64),
-            String(size) => quote!(arrayvec::ArrayString::<#size>::new_const()),
             Array(ty, size) => {
                 let default_value = ty.emit_default_value();
                 quote!([#default_value; #size])
@@ -1575,7 +1544,7 @@ pub fn extra_crc(msg: &MavMessage) -> u8 {
             crc.digest(field.name.as_bytes());
         }
         crc.digest(b" ");
-        if let MavType::String(size) | MavType::Array(_, size) = field.mavtype {
+        if let MavType::Array(_, size) = field.mavtype {
             crc.digest(&[size as u8]);
         }
     }

mavlink/Cargo.toml

@@ -37,7 +37,6 @@ serde = { version = "1.0.115", optional = true, features = ["derive"] }
 serde_arrays = { version = "0.2.0", optional = true }
 arbitrary = { version = "1.4", optional = true, features = ["derive"] }
 rand = { version = "0.9", optional = true, default-features = false, features = ["std", "std_rng"] }
-arrayvec = { version = "0.7.6", default-features = false }
 
 [features]
 default = ["std", "tcp", "udp", "direct-serial", "serde", "ardupilotmega", "common"]
@@ -86,7 +85,7 @@ all-dialects = [
 format-generated-code = []
 emit-description = ["mavlink-bindgen/emit-description"]
 emit-extensions = ["mavlink-bindgen/emit-extensions"]
-std = ["mavlink-core/std", "arrayvec/std"]
+std = ["mavlink-core/std"]
 udp = ["mavlink-core/udp"]
 tcp = ["mavlink-core/tcp"]
 signing = ["mavlink-core/signing"]
@@ -96,7 +95,7 @@ direct-serial = ["mavlink-core/direct-serial"]
 # Use 'embedded-hal-0.2' feature to enable deprecated embedded-hal=0.2.3 (some hals is not supports embedded-hal=1.0 yet).
 embedded = ["mavlink-core/embedded"]
 embedded-hal-02 = ["mavlink-core/embedded-hal-02"]
-serde = ["bitflags/serde", "dep:serde", "dep:serde_arrays", "mavlink-core/serde", "arrayvec/serde"]
+serde = ["bitflags/serde", "dep:serde", "dep:serde_arrays", "mavlink-core/serde"]
 tokio-1 = ["mavlink-core/tokio-1"]
 arbitrary = ["dep:arbitrary", "dep:rand", "mavlink-bindgen/arbitrary", "mavlink-core/arbitrary"]
 

mavlink/tests/serde_test.rs

@@ -125,7 +125,7 @@ mod serde_test {
             f: f32::EPSILON,
             f_array: [f32::NEG_INFINITY, 0.0, f32::MIN],
             c: b'R',
-            s: arrayvec::ArrayString::from("rustmavlin").unwrap(), // 10 chars
+            s: *b"rustmavlin", // 10 chars
         });
         assert_tokens(
             &test_message,
@@ -203,7 +203,18 @@ mod serde_test {
                 Str("c"),
                 U8(b'R'),
                 Str("s"),
-                Str("rustmavlin"),
+                Tuple { len: 10 },
+                U8(b'r'),
+                U8(b'u'),
+                U8(b's'),
+                U8(b't'),
+                U8(b'm'),
+                U8(b'a'),
+                U8(b'v'),
+                U8(b'l'),
+                U8(b'i'),
+                U8(b'n'),
+                TupleEnd,
                 Str("u8"),
                 U8(0),
                 Str("s8"),

mavlink/tests/v2_encode_decode_tests.rs

@@ -166,42 +166,4 @@ mod test_v2_encode_decode {
             }
         }
     }
-
-    pub const STATUSTEXT_V2: &[u8] = &[
-        mavlink::MAV_STX_V2,
-        0x06, // payload is 6 bytes.``
-        0x00,
-        0x00,
-        0x05,
-        0x2a,
-        0x04,
-        0xfd, // This is STATUSTEXT
-        0x00,
-        0x00,
-        0x02, // Severity
-        0x79, // "y"
-        0x6f, // "o"
-        0x75, // "u"
-        0x70, // "p"
-        0x69, // "i"
-        0x49, // CRC
-        0x00, // CRC
-    ];
-
-    /// It is in the V2 tests because of the trail of 0s that gets truncated at the end.
-    #[test]
-    pub fn test_read_string() {
-        let mut r = PeekReader::new(STATUSTEXT_V2);
-        let (_header, msg) = mavlink::read_v2_msg(&mut r).expect("Failed to parse message");
-
-        if let mavlink::common::MavMessage::STATUSTEXT(data) = msg {
-            assert_eq!(
-                data.severity,
-                mavlink::common::MavSeverity::MAV_SEVERITY_CRITICAL
-            );
-            assert_eq!(data.text.as_str(), "youpi");
-        } else {
-            panic!("Decoded wrong message type")
-        }
-    }
 }