Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions mavlink-bindgen/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -746,11 +746,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() {
quote!(#[cfg_attr(feature = "serde", serde(default))])
} else {
quote!(#[cfg_attr(feature = "serde", serde(default = "crate::RustDefault::rust_default"))])
}
quote!(#[cfg_attr(feature = "serde", serde(default))])
} else {
quote!()
};
Expand Down
2 changes: 0 additions & 2 deletions mavlink-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ use core::result::Result;
use std::io::{Read, Write};

pub mod utils;
#[allow(unused_imports)]
use utils::{remove_trailing_zeroes, RustDefault};

#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
Expand Down
4 changes: 2 additions & 2 deletions mavlink-core/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ impl<const N: usize> From<&str> for CharArray<N> {
}
}

impl<const N: usize> crate::utils::RustDefault for CharArray<N> {
impl<const N: usize> Default for CharArray<N> {
#[inline(always)]
fn rust_default() -> Self {
fn default() -> Self {
Self::new([0u8; N])
}
}
Expand Down
41 changes: 0 additions & 41 deletions mavlink-core/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,47 +16,6 @@ pub fn remove_trailing_zeroes(data: &[u8]) -> usize {
len
}

/// A trait very similar to [`Default`] but is only implemented for the equivalent Rust types to
/// `MavType`s.
///
/// This is only needed because rust doesn't currently implement `Default` for arrays
/// of all sizes. In particular this trait is only ever used when the "serde" feature is enabled.
/// For more information, check out [this issue](https://users.rust-lang.org/t/issue-for-derives-for-arrays-greater-than-size-32/59055/3).
pub trait RustDefault: Copy {
fn rust_default() -> Self;
}

impl<T: RustDefault, const N: usize> RustDefault for [T; N] {
#[inline(always)]
fn rust_default() -> Self {
let val: T = RustDefault::rust_default();
[val; N]
}
}

macro_rules! impl_rust_default {
($($t:ty => $val:expr),* $(,)?) => {
$(impl RustDefault for $t {
#[inline(always)]
fn rust_default() -> Self { $val }
})*
};
}

impl_rust_default! {
u8 => 0,
i8 => 0,
u16 => 0,
i16 => 0,
u32 => 0,
i32 => 0,
u64 => 0,
i64 => 0,
f32 => 0.0,
f64 => 0.0,
char => '\0',
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
4 changes: 0 additions & 4 deletions mavlink/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ include!(concat!(env!("OUT_DIR"), "/mod.rs"));

pub use mavlink_core::*;

#[cfg(feature = "emit-extensions")]
#[allow(unused_imports)]
pub(crate) use mavlink_core::utils::RustDefault;

#[cfg(feature = "serde")]
#[allow(unused_imports)]
pub(crate) use mavlink_core::utils::nulstr;
Loading