From 6abecf1a9d092027e0667a2db1781ea0221b092f Mon Sep 17 00:00:00 2001
From: Liam Kinne <liam@kinne.io>
Date: Wed, 22 Jan 2025 16:30:46 +1000
Subject: [PATCH] remove quotes from features and reorder important features

---
 mavlink-core/Cargo.toml | 21 +++++++-------
 mavlink/Cargo.toml      | 63 +++++++++++++++++++++--------------------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/mavlink-core/Cargo.toml b/mavlink-core/Cargo.toml
index 413572b61f..4ba167821d 100644
--- a/mavlink-core/Cargo.toml
+++ b/mavlink-core/Cargo.toml
@@ -32,19 +32,20 @@ async-trait = { version = "0.1.18", optional = true }
 tokio-serial = { version = "5.4.4", default-features = false, optional = true }
 
 [features]
-"std" = ["byteorder/std"]
-"udp" = []
-"tcp" = []
-"direct-serial" = ["serial"]
+default = ["std", "tcp", "udp", "direct-serial", "serde"]
+
+std = ["byteorder/std"]
+udp = []
+tcp = []
+direct-serial = ["serial"]
 # NOTE: Only one of 'embedded' and 'embedded-hal-02' features can be enabled.
 # Use "embedded' feature to enable embedded-hal=1.0 (embedded-io and embedded-io-async is part of embedded-hal).
 # 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" = ["dep:embedded-io", "dep:embedded-io-async"]
-"embedded-hal-02" = ["dep:nb", "dep:embedded-hal-02"]
-"serde" = ["dep:serde", "dep:serde_arrays"]
-"tokio-1" = ["dep:tokio", "dep:async-trait", "dep:tokio-serial"]
-"signing" = ["dep:sha2"]
-default = ["std", "tcp", "udp", "direct-serial", "serde"]
+embedded = ["dep:embedded-io", "dep:embedded-io-async"]
+embedded-hal-02 = ["dep:nb", "dep:embedded-hal-02"]
+serde = ["dep:serde", "dep:serde_arrays"]
+tokio-1 = ["dep:tokio", "dep:async-trait", "dep:tokio-serial"]
+signing = ["dep:sha2"]
 
 [dev-dependencies]
 tokio = { version = "1.0", default-features = false, features = ["io-util", "net", "sync", "fs", "macros", "rt"] }
\ No newline at end of file
diff --git a/mavlink/Cargo.toml b/mavlink/Cargo.toml
index 669d9b0752..9a9e2cec65 100644
--- a/mavlink/Cargo.toml
+++ b/mavlink/Cargo.toml
@@ -35,7 +35,8 @@ serde = { version = "1.0.115", optional = true, features = ["derive"] }
 serde_arrays = { version = "0.1.0", optional = true }
 
 [features]
-"all" = [
+default = ["std", "tcp", "udp", "direct-serial", "serde", "ardupilotmega"]
+all = [
     "ardupilotmega",
     "asluav",
     "common",
@@ -50,24 +51,25 @@ serde_arrays = { version = "0.1.0", optional = true }
     "avssuas",
     "cubepilot",
 ]
-"ardupilotmega" = ["common", "icarous", "uavionix"]
-"asluav" = ["common"]
-"avssuas" = ["common"]
-"development" = ["common"]
-"matrixpilot" = ["common"]
-"minimal" = []
-"paparazzi" = ["common"]
-"python_array_test" = ["common"]
-"slugs" = ["common"]
-"standard" = ["common"]
-"test" = []
-"ualberta" = ["common"]
-"uavionix" = ["common"]
-"icarous" = []
-"common" = []
-"cubepilot" = ["common"]
 
-"all-dialects" = [
+ardupilotmega = ["common", "icarous", "uavionix"]
+asluav = ["common"]
+avssuas = ["common"]
+development = ["common"]
+matrixpilot = ["common"]
+minimal = []
+paparazzi = ["common"]
+python_array_test = ["common"]
+slugs = ["common"]
+standard = ["common"]
+test = []
+ualberta = ["common"]
+uavionix = ["common"]
+icarous = []
+common = []
+cubepilot = ["common"]
+
+all-dialects = [
     "ardupilotmega",
     "asluav",
     "avssuas",
@@ -86,22 +88,21 @@ serde_arrays = { version = "0.1.0", optional = true }
     "cubepilot",
 ]
 
-"format-generated-code" = []
-"emit-description" = ["mavlink-bindgen/emit-description"]
-"emit-extensions" = ["mavlink-bindgen/emit-extensions"]
-"std" = ["mavlink-core/std"]
-"udp" = ["mavlink-core/udp"]
-"tcp" = ["mavlink-core/tcp"]
-"signing" = ["mavlink-core/signing"]
-"direct-serial" = ["mavlink-core/direct-serial"]
+format-generated-code = []
+emit-description = ["mavlink-bindgen/emit-description"]
+emit-extensions = ["mavlink-bindgen/emit-extensions"]
+std = ["mavlink-core/std"]
+udp = ["mavlink-core/udp"]
+tcp = ["mavlink-core/tcp"]
+signing = ["mavlink-core/signing"]
+direct-serial = ["mavlink-core/direct-serial"]
 # NOTE: Only one of 'embedded' and 'embedded-hal-02' features can be enabled.
 # Use "embedded' feature to enable embedded-hal=1.0 (embedded-io and embedded-io-async is part of embedded-hal).
 # 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" = ["mavlink-core/serde", "dep:serde", "dep:serde_arrays"]
-"tokio-1" = ["mavlink-core/tokio-1"]
-default = ["std", "tcp", "udp", "direct-serial", "serde", "ardupilotmega"]
+embedded = ["mavlink-core/embedded"]
+embedded-hal-02 = ["mavlink-core/embedded-hal-02"]
+serde = ["mavlink-core/serde", "dep:serde", "dep:serde_arrays"]
+tokio-1 = ["mavlink-core/tokio-1"]
 
 # build with all features on docs.rs so that users viewing documentation
 # can see everything