diff --git a/mavlink-bindgen/src/parser.rs b/mavlink-bindgen/src/parser.rs index 45474ddf140..86fb2fd4bac 100644 --- a/mavlink-bindgen/src/parser.rs +++ b/mavlink-bindgen/src/parser.rs @@ -216,16 +216,12 @@ impl MavProfile { #comment #![allow(deprecated)] #[allow(unused_imports)] - use num_derive::FromPrimitive; + use num_derive::{FromPrimitive, ToPrimitive}; #[allow(unused_imports)] - use num_traits::FromPrimitive; - #[allow(unused_imports)] - use num_derive::ToPrimitive; - #[allow(unused_imports)] - use num_traits::ToPrimitive; + use num_traits::{FromPrimitive, ToPrimitive}; #[allow(unused_imports)] use bitflags::{bitflags, Flags}; - + #[allow(unused_imports)] use mavlink_core::{MavlinkVersion, Message, MessageData, bytes::Bytes, bytes_mut::BytesMut, types::CharArray}; #[cfg(feature = "serde")] @@ -469,11 +465,19 @@ impl MavProfile { }) .collect(); - quote! { - fn target_system_id(&self) -> Option { - match self { - #(#arms)* - _ => None, + if arms.is_empty() { + quote! { + fn target_system_id(&self) -> Option { + None + } + } + } else { + quote! { + fn target_system_id(&self) -> Option { + match self { + #(#arms)* + _ => None, + } } } } @@ -491,11 +495,19 @@ impl MavProfile { }) .collect(); - quote! { - fn target_component_id(&self) -> Option { - match self { - #(#arms)* - _ => None, + if arms.is_empty() { + quote! { + fn target_component_id(&self) -> Option { + None + } + } + } else { + quote! { + fn target_component_id(&self) -> Option { + match self { + #(#arms)* + _ => None, + } } } } diff --git a/mavlink-bindgen/tests/snapshots/e2e_snapshots__deprecated.xml@deprecated.rs.snap b/mavlink-bindgen/tests/snapshots/e2e_snapshots__deprecated.xml@deprecated.rs.snap index 5acb9ac4ad3..51d32426160 100644 --- a/mavlink-bindgen/tests/snapshots/e2e_snapshots__deprecated.xml@deprecated.rs.snap +++ b/mavlink-bindgen/tests/snapshots/e2e_snapshots__deprecated.xml@deprecated.rs.snap @@ -10,17 +10,14 @@ expression: contents use arbitrary::Arbitrary; #[allow(unused_imports)] use bitflags::{bitflags, Flags}; +#[allow(unused_imports)] use mavlink_core::{ bytes::Bytes, bytes_mut::BytesMut, types::CharArray, MavlinkVersion, Message, MessageData, }; #[allow(unused_imports)] -use num_derive::FromPrimitive; -#[allow(unused_imports)] -use num_derive::ToPrimitive; -#[allow(unused_imports)] -use num_traits::FromPrimitive; +use num_derive::{FromPrimitive, ToPrimitive}; #[allow(unused_imports)] -use num_traits::ToPrimitive; +use num_traits::{FromPrimitive, ToPrimitive}; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; #[cfg(feature = "ts")] diff --git a/mavlink-bindgen/tests/snapshots/e2e_snapshots__heartbeat.xml@heartbeat.rs.snap b/mavlink-bindgen/tests/snapshots/e2e_snapshots__heartbeat.xml@heartbeat.rs.snap index 1c8d02fca5f..d63614c36a7 100644 --- a/mavlink-bindgen/tests/snapshots/e2e_snapshots__heartbeat.xml@heartbeat.rs.snap +++ b/mavlink-bindgen/tests/snapshots/e2e_snapshots__heartbeat.xml@heartbeat.rs.snap @@ -11,17 +11,14 @@ expression: contents use arbitrary::Arbitrary; #[allow(unused_imports)] use bitflags::{bitflags, Flags}; +#[allow(unused_imports)] use mavlink_core::{ bytes::Bytes, bytes_mut::BytesMut, types::CharArray, MavlinkVersion, Message, MessageData, }; #[allow(unused_imports)] -use num_derive::FromPrimitive; -#[allow(unused_imports)] -use num_derive::ToPrimitive; -#[allow(unused_imports)] -use num_traits::FromPrimitive; +use num_derive::{FromPrimitive, ToPrimitive}; #[allow(unused_imports)] -use num_traits::ToPrimitive; +use num_traits::{FromPrimitive, ToPrimitive}; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; #[cfg(feature = "ts")] @@ -192,13 +189,9 @@ impl Message for MavMessage { } } fn target_system_id(&self) -> Option { - match self { - _ => None, - } + None } fn target_component_id(&self) -> Option { - match self { - _ => None, - } + None } } diff --git a/mavlink-bindgen/tests/snapshots/e2e_snapshots__mav_bool.xml@mav_bool.rs.snap b/mavlink-bindgen/tests/snapshots/e2e_snapshots__mav_bool.xml@mav_bool.rs.snap index 0175e386f2d..eef4bddec57 100644 --- a/mavlink-bindgen/tests/snapshots/e2e_snapshots__mav_bool.xml@mav_bool.rs.snap +++ b/mavlink-bindgen/tests/snapshots/e2e_snapshots__mav_bool.xml@mav_bool.rs.snap @@ -11,17 +11,14 @@ expression: contents use arbitrary::Arbitrary; #[allow(unused_imports)] use bitflags::{bitflags, Flags}; +#[allow(unused_imports)] use mavlink_core::{ bytes::Bytes, bytes_mut::BytesMut, types::CharArray, MavlinkVersion, Message, MessageData, }; #[allow(unused_imports)] -use num_derive::FromPrimitive; -#[allow(unused_imports)] -use num_derive::ToPrimitive; -#[allow(unused_imports)] -use num_traits::FromPrimitive; +use num_derive::{FromPrimitive, ToPrimitive}; #[allow(unused_imports)] -use num_traits::ToPrimitive; +use num_traits::{FromPrimitive, ToPrimitive}; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; #[cfg(feature = "ts")] @@ -204,13 +201,9 @@ impl Message for MavMessage { } } fn target_system_id(&self) -> Option { - match self { - _ => None, - } + None } fn target_component_id(&self) -> Option { - match self { - _ => None, - } + None } } diff --git a/mavlink-bindgen/tests/snapshots/e2e_snapshots__no_field_description.xml@no_field_description.rs.snap b/mavlink-bindgen/tests/snapshots/e2e_snapshots__no_field_description.xml@no_field_description.rs.snap index 0c0ef6f1b5c..ec1e50d8878 100644 --- a/mavlink-bindgen/tests/snapshots/e2e_snapshots__no_field_description.xml@no_field_description.rs.snap +++ b/mavlink-bindgen/tests/snapshots/e2e_snapshots__no_field_description.xml@no_field_description.rs.snap @@ -10,17 +10,14 @@ expression: contents use arbitrary::Arbitrary; #[allow(unused_imports)] use bitflags::{bitflags, Flags}; +#[allow(unused_imports)] use mavlink_core::{ bytes::Bytes, bytes_mut::BytesMut, types::CharArray, MavlinkVersion, Message, MessageData, }; #[allow(unused_imports)] -use num_derive::FromPrimitive; -#[allow(unused_imports)] -use num_derive::ToPrimitive; -#[allow(unused_imports)] -use num_traits::FromPrimitive; +use num_derive::{FromPrimitive, ToPrimitive}; #[allow(unused_imports)] -use num_traits::ToPrimitive; +use num_traits::{FromPrimitive, ToPrimitive}; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; #[cfg(feature = "ts")] @@ -180,13 +177,9 @@ impl Message for MavMessage { } } fn target_system_id(&self) -> Option { - match self { - _ => None, - } + None } fn target_component_id(&self) -> Option { - match self { - _ => None, - } + None } } diff --git a/mavlink-bindgen/tests/snapshots/e2e_snapshots__parameters.xml@parameters.rs.snap b/mavlink-bindgen/tests/snapshots/e2e_snapshots__parameters.xml@parameters.rs.snap index ef93656fc25..2c747ca47a6 100644 --- a/mavlink-bindgen/tests/snapshots/e2e_snapshots__parameters.xml@parameters.rs.snap +++ b/mavlink-bindgen/tests/snapshots/e2e_snapshots__parameters.xml@parameters.rs.snap @@ -10,17 +10,14 @@ expression: contents use arbitrary::Arbitrary; #[allow(unused_imports)] use bitflags::{bitflags, Flags}; +#[allow(unused_imports)] use mavlink_core::{ bytes::Bytes, bytes_mut::BytesMut, types::CharArray, MavlinkVersion, Message, MessageData, }; #[allow(unused_imports)] -use num_derive::FromPrimitive; -#[allow(unused_imports)] -use num_derive::ToPrimitive; -#[allow(unused_imports)] -use num_traits::FromPrimitive; +use num_derive::{FromPrimitive, ToPrimitive}; #[allow(unused_imports)] -use num_traits::ToPrimitive; +use num_traits::{FromPrimitive, ToPrimitive}; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; #[cfg(feature = "ts")] diff --git a/mavlink/tests/serde_test.rs b/mavlink/tests/serde_test.rs index 81ab72af52e..7cf3fca2c4f 100644 --- a/mavlink/tests/serde_test.rs +++ b/mavlink/tests/serde_test.rs @@ -99,7 +99,6 @@ mod serde_test { #[test] fn test_ser_de_all_types() { use core::{f32, f64}; - use std::u64; use mavlink_core::types::CharArray; @@ -284,8 +283,6 @@ mod serde_test_json { #[test] fn test_serde_input() { - use std::ops::Deref; - let heartbeat_json = json!({ "type": "HEARTBEAT", "custom_mode": 0,