Skip to content

Fix warnings in test and for certain dialects #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix warnings in test and for certain dialects #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eff75bb
fix unused import when no message uses char
pv42 Oct 21, 2025
1f2845d
remove unused in tests imports, simplify imports in generated code
pv42 Oct 21, 2025
5c6c4e5
fix warning on dialects without target system/component
pv42 Oct 21, 2025
e572e07
adjust snapshot tests
pv42 Oct 21, 2025
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
46 changes: 29 additions & 17 deletions mavlink-bindgen/src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -469,11 +465,19 @@ impl MavProfile {
})
.collect();

quote! {
fn target_system_id(&self) -> Option<u8> {
match self {
#(#arms)*
_ => None,
if arms.is_empty() {
quote! {
fn target_system_id(&self) -> Option<u8> {
None
}
}
} else {
quote! {
fn target_system_id(&self) -> Option<u8> {
match self {
#(#arms)*
_ => None,
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we ignore the warning with allowing it? The code became very ugly tbh.

}
}
}
Expand All @@ -491,11 +495,19 @@ impl MavProfile {
})
.collect();

quote! {
fn target_component_id(&self) -> Option<u8> {
match self {
#(#arms)*
_ => None,
if arms.is_empty() {
quote! {
fn target_component_id(&self) -> Option<u8> {
None
}
}
} else {
quote! {
fn target_component_id(&self) -> Option<u8> {
match self {
#(#arms)*
_ => None,
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

}
}
}
Expand Down
9 changes: 3 additions & 6 deletions mavlink-bindgen/tests/snapshots/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
17 changes: 5 additions & 12 deletions mavlink-bindgen/tests/snapshots/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -192,13 +189,9 @@ impl Message for MavMessage {
}
}
fn target_system_id(&self) -> Option<u8> {
match self {
_ => None,
}
None
}
fn target_component_id(&self) -> Option<u8> {
match self {
_ => None,
}
None
}
}
17 changes: 5 additions & 12 deletions mavlink-bindgen/tests/snapshots/e2e_snapshots__mav_bool.xml@mav_bool.rs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -204,13 +201,9 @@ impl Message for MavMessage {
}
}
fn target_system_id(&self) -> Option<u8> {
match self {
_ => None,
}
None
}
fn target_component_id(&self) -> Option<u8> {
match self {
_ => None,
}
None
}
}
17 changes: 5 additions & 12 deletions ...dgen/tests/snapshots/e2e_snapshots__no_field_description.xml@no_field_description.rs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -180,13 +177,9 @@ impl Message for MavMessage {
}
}
fn target_system_id(&self) -> Option<u8> {
match self {
_ => None,
}
None
}
fn target_component_id(&self) -> Option<u8> {
match self {
_ => None,
}
None
}
}
9 changes: 3 additions & 6 deletions mavlink-bindgen/tests/snapshots/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
3 changes: 0 additions & 3 deletions mavlink/tests/serde_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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,
Expand Down