Deserialize features into BTreeSet

bob_the_builder/src/cargo_toml.rs

@@ -94,7 +94,7 @@ pub mod workspace {
 }
 
 pub mod package {
-    use std::hash::Hash;
+    use std::{collections::BTreeSet, hash::Hash};
 
     use serde::Deserialize;
 
@@ -138,7 +138,7 @@ pub mod package {
     #[derive(Clone, Deserialize, Debug, Default, PartialEq, Eq, Hash)]
     pub struct BuildSettings {
         /// Features to be enabled for this build.
-        pub features: Option<Vec<Feature>>,
+        pub features: Option<BTreeSet<Feature>>,
     }
 
     /// Get all the builds and wasm name from the `Cargo.toml` file.
@@ -191,6 +191,7 @@ pub mod package {
             builds = [
                 { name = "optimized", features = ["opt1", "opt2"] },
                 { name = "debug", features = ["debug"] },
+                { name = "boring", features = [] },
             ]
             "#;
 
@@ -205,13 +206,22 @@ pub mod package {
                         Build {
                             name: "optimized".to_string(),
                             settings: BuildSettings {
-                                features: Some(vec!["opt1".to_string(), "opt2".to_string()])
+                                features: Some(BTreeSet::from([
+                                    "opt1".to_string(),
+                                    "opt2".to_string()
+                                ]))
                             }
                         },
                         Build {
                             name: "debug".to_string(),
                             settings: BuildSettings {
-                                features: Some(vec!["debug".to_string()])
+                                features: Some(BTreeSet::from(["debug".to_string()]))
+                            }
+                        },
+                        Build {
+                            name: "boring".to_string(),
+                            settings: BuildSettings {
+                                features: Some(BTreeSet::default())
                             }
                         }
                     ]

bob_the_builder/src/pkg_build.rs

@@ -19,10 +19,9 @@ impl ParsedPackage {
         let mut builds_with_settings: HashMap<BuildSettings, BuildName> = HashMap::new();
 
         // Build all the requested builds
-        for mut build in self.builds.into_iter() {
+        for build in self.builds.into_iter() {
             // Sort features so feature ordering doesn't matter.
-            let settings = &mut build.settings;
-            settings.features.as_mut().map(|f| f.sort());
+            let settings = &build.settings;
 
             if builds_with_settings.contains_key(settings) {
                 // build already exists, copy the wasm file with identical features to a new build name
@@ -69,14 +68,9 @@ impl Build {
         .map(|arg| arg.to_string())
         .collect::<Vec<String>>();
 
-        let featured_arg: String = if !features.is_empty() {
-            features.join(",")
-        } else {
-            String::new()
-        };
-
         // Add features to command
-        args.push(format!("--features={}", featured_arg));
+        let features_arg = features.into_iter().collect::<Vec<String>>().join(", ");
+        args.push(format!("--features={}", features_arg));
 
         // Run the build
         let mut child = Command::new(crate::CARGO_PATH)