Merge pull request #33 from Rust-GPU/feature/boolean-values-in-toml-become-flags-in-build-parameters

feature: treat boolean values in toml files as flags

Author: schell

crates/cargo-gpu/src/spirv_cli.rs

@@ -166,6 +166,7 @@ impl SpirvCli {
         if self.is_toolchain_install_consent {
             return Ok(());
         }
+        log::debug!("asking for consent to install the required toolchain");
         crossterm::terminal::enable_raw_mode()?;
         crate::user_output!("{prompt} [y/n]: ");
         let input = crossterm::event::read()?;

crates/cargo-gpu/src/toml.rs

@@ -75,43 +75,20 @@ impl Toml {
         } else {
             anyhow::bail!("toml file '{}' must describe a workspace containing [workspace.metadata.rust-gpu.build] or a describe a crate with [package.metadata.rust-gpu.build]", path.display());
         };
+
         log::info!(
             "building with [{toml_type}.metadata.rust-gpu.build] section of the toml file at '{}'",
             path.display()
         );
         log::debug!("table: {table:#?}");
 
-        let mut parameters: Vec<String> = table
-            .get("build")
-            .with_context(|| "toml is missing the 'build' table")?
-            .as_table()
-            .with_context(|| {
-                format!("toml file's '{toml_type}.metadata.rust-gpu.build' property is not a table")
-            })?
-            .into_iter()
-            .map(|(key, val)| -> anyhow::Result<Vec<String>> {
-                Ok(if let toml::Value::String(string) = val {
-                    [format!("--{key}"), string.clone()].into()
-                } else {
-                    let mut value = String::new();
-                    let ser = toml::ser::ValueSerializer::new(&mut value);
-                    serde::Serialize::serialize(val, ser)?;
-                    [format!("--{key}"), value].into()
-                })
-            })
-            .collect::<anyhow::Result<Vec<Vec<String>>>>()?
-            .into_iter()
-            .flatten()
-            .collect();
-        parameters.insert(0, "cargo-gpu".to_owned());
-        parameters.insert(1, "build".to_owned());
-
         log::info!(
             "issuing cargo commands from the working directory '{}'",
             working_directory.display()
         );
         std::env::set_current_dir(working_directory)?;
 
+        let parameters = construct_build_parameters_from_toml_table(toml_type, &table)?;
         log::debug!("build parameters: {parameters:#?}");
         if let Cli {
             command: Command::Build(mut build),
@@ -162,3 +139,48 @@ impl Toml {
         metadata.get("rust-gpu")?.as_table()
     }
 }
+
+/// Construct the cli parameters to run a `cargo gpu build` command from a TOML table.
+fn construct_build_parameters_from_toml_table(
+    toml_type: &str,
+    table: &toml::map::Map<String, toml::Value>,
+) -> Result<Vec<String>, anyhow::Error> {
+    let build_table = table
+        .get("build")
+        .with_context(|| "toml is missing the 'build' table")?
+        .as_table()
+        .with_context(|| {
+            format!("toml file's '{toml_type}.metadata.rust-gpu.build' property is not a table")
+        })?;
+    let mut parameters: Vec<String> = build_table
+        .into_iter()
+        .map(|(key, val)| -> anyhow::Result<Vec<String>> {
+            Ok(match val {
+                toml::Value::String(string) => vec![format!("--{key}"), string.clone()],
+                toml::Value::Boolean(truthy) => {
+                    if *truthy {
+                        vec![format!("--{key}")]
+                    } else {
+                        vec![]
+                    }
+                }
+                toml::Value::Integer(_)
+                | toml::Value::Float(_)
+                | toml::Value::Datetime(_)
+                | toml::Value::Array(_)
+                | toml::Value::Table(_) => {
+                    let mut value = String::new();
+                    let ser = toml::ser::ValueSerializer::new(&mut value);
+                    serde::Serialize::serialize(val, ser)?;
+                    vec![format!("--{key}"), value]
+                }
+            })
+        })
+        .collect::<anyhow::Result<Vec<Vec<String>>>>()?
+        .into_iter()
+        .flatten()
+        .collect();
+    parameters.insert(0, "cargo-gpu".to_owned());
+    parameters.insert(1, "build".to_owned());
+    Ok(parameters)
+}