XXX feature permutations fix

Author: phip1611

xtask/src/main.rs

@@ -21,24 +21,22 @@ use opt::{Action, BuildOpt, ClippyOpt, DocOpt, Opt, QemuOpt, TpmVersion};
 use std::process::Command;
 use util::run_cmd;
 
+/// Builds various feature permutations that are valid for the `uefi` crate.
 fn build_feature_permutations(opt: &BuildOpt) -> Result<()> {
-    // TODO we should now rethink this
-    for package in [Package::Uefi] {
-        let all_package_features = Feature::package_features(package);
-        for features in all_package_features.iter().powerset() {
-            let features = features.iter().map(|f| **f).collect();
+    let all_package_features = Feature::package_features(Package::Uefi);
+    for features in all_package_features.iter().powerset() {
+        let features = features.iter().map(|f| **f).collect();
 
-            let cargo = Cargo {
-                action: CargoAction::Build,
-                features,
-                packages: vec![package],
-                release: opt.build_mode.release,
-                target: Some(*opt.target),
-                warnings_as_errors: true,
-                target_types: TargetTypes::BinsExamplesLib,
-            };
-            run_cmd(cargo.command()?)?;
-        }
+        let cargo = Cargo {
+            action: CargoAction::Build,
+            features,
+            packages: vec![Package::Uefi],
+            release: opt.build_mode.release,
+            target: Some(*opt.target),
+            warnings_as_errors: true,
+            target_types: TargetTypes::BinsExamplesLib,
+        };
+        run_cmd(cargo.command()?)?;
     }
 
     Ok(())