Avoid RUSTFLAGS as much as possible

crates/cli-tools/CHANGELOG.md

@@ -2,4 +2,4 @@
 
 ## 0.1.0-git
 
-<!-- Increment to skip CHANGELOG.md test: 8 -->
+<!-- Increment to skip CHANGELOG.md test: 11 -->

crates/cli-tools/src/action.rs

@@ -97,13 +97,13 @@ impl RustAppletBuild {
         let target_dir = fs::try_relative(std::env::current_dir()?, &metadata.target_directory)?;
         let name = package.name.replace('-', "_");
         let mut cargo = Command::new("cargo");
-        let mut rustflags = vec![
-            "-C panic=abort".to_string(),
-            "-C codegen-units=1".to_string(),
-            "-C embed-bitcode=yes".to_string(),
-            "-C lto=fat".to_string(),
-        ];
+        let mut rustflags = Vec::new();
         cargo.args(["rustc", "--lib"]);
+        // We deliberately don't use the provided profile for those configs because they don't
+        // depend on user-provided options (as opposed to opt-level).
+        cargo.arg("--config=profile.release.codegen-units=1");
+        cargo.arg("--config=profile.release.lto=true");
+        cargo.arg("--config=profile.release.panic=\"abort\"");
         match &self.native {
             None => {
                 rustflags.push(format!("-C link-arg=-zstack-size={}", self.stack_size));
@@ -116,12 +116,10 @@ impl RustAppletBuild {
                 wasefire_feature(package, "native", &mut cargo)?;
             }
         }
-        match &self.profile {
-            Some(profile) => drop(cargo.arg(format!("--profile={profile}"))),
-            None => drop(cargo.arg("--release")),
-        }
+        let profile = self.profile.as_deref().unwrap_or("release");
+        cargo.arg(format!("--profile={profile}"));
         if let Some(level) = self.opt_level {
-            rustflags.push(format!("-C opt-level={level}"));
+            cargo.arg(format!("--config=profile.{profile}.opt-level={level}"));
         }
         cargo.args(&self.cargo);
         if self.prod {
@@ -137,8 +135,8 @@ impl RustAppletBuild {
             None => "target/wasefire".into(),
         };
         let (src, dst) = match &self.native {
-            None => (format!("wasm32-unknown-unknown/release/{name}.wasm"), "applet.wasm"),
-            Some(target) => (format!("{target}/release/lib{name}.a"), "libapplet.a"),
+            None => (format!("wasm32-unknown-unknown/{profile}/{name}.wasm"), "applet.wasm"),
+            Some(target) => (format!("{target}/{profile}/lib{name}.a"), "libapplet.a"),
         };
         let applet = out_dir.join(dst);
         if fs::copy_if_changed(target_dir.join(src), &applet)? && dst.ends_with(".wasm") {
@@ -186,7 +184,13 @@ pub enum OptLevel {
 
 impl Display for OptLevel {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.to_possible_value().unwrap().get_name())
+        let value = self.to_possible_value().unwrap();
+        let name = value.get_name();
+        if f.alternate() || !matches!(self, OptLevel::Os | OptLevel::Oz) {
+            write!(f, "{name}")
+        } else {
+            write!(f, "{name:?}")
+        }
     }
 }
 
@@ -198,7 +202,7 @@ pub fn optimize_wasm(applet: impl AsRef<Path>, opt_level: Option<OptLevel>) -> R
     let mut opt = Command::new("wasm-opt");
     opt.args(["--enable-bulk-memory", "--enable-sign-ext", "--enable-mutable-globals"]);
     match opt_level {
-        Some(level) => drop(opt.arg(format!("-O{level}"))),
+        Some(level) => drop(opt.arg(format!("-O{level:#}"))),
         None => drop(opt.arg("-O")),
     }
     opt.arg(applet.as_ref());

crates/xtask/Cargo.toml

@@ -16,7 +16,6 @@ probe-rs = "0.24.0"
 rustc-demangle = "0.1.24"
 serde = { version = "1.0.202", features = ["derive"] }
 stack-sizes = "0.5.0"
-strum = { version = "0.26.2", features = ["derive"] }
 wasefire-cli-tools = { version = "0.1.0-git", path = "../cli-tools" }
 
 [lints]

crates/xtask/src/main.rs

@@ -24,7 +24,6 @@ use lazy_static::lazy_static;
 use probe_rs::config::TargetSelector;
 use probe_rs::{flashing, Permissions, Session};
 use rustc_demangle::demangle;
-use strum::{Display, EnumString};
 use wasefire_cli_tools::{action, cmd, fs};
 
 mod footprint;
@@ -167,7 +166,7 @@ struct RunnerOptions {
 
     /// Optimization level (0, 1, 2, 3, s, z).
     #[clap(long, short = 'O')]
-    opt_level: Option<OptLevel>,
+    opt_level: Option<action::OptLevel>,
 
     /// Produces target/wasefire/platform_{side}.bin files instead of flashing.
     #[clap(long)]
@@ -218,22 +217,6 @@ struct RunnerOptions {
     memory_page_count: Option<usize>,
 }
 
-#[derive(Copy, Clone, EnumString, Display)]
-enum OptLevel {
-    #[strum(serialize = "0")]
-    O0,
-    #[strum(serialize = "1")]
-    O1,
-    #[strum(serialize = "2")]
-    O2,
-    #[strum(serialize = "3")]
-    O3,
-    #[strum(serialize = "s")]
-    Os,
-    #[strum(serialize = "z")]
-    Oz,
-}
-
 impl Flags {
     fn execute(self) -> Result<()> {
         match self.command {
@@ -413,17 +396,15 @@ impl RunnerOptions {
             if main.release {
                 cargo.arg("-Zbuild-std=core,alloc");
                 cargo.arg("-Zbuild-std-features=panic_immediate_abort");
-                rustflags.push("-C lto=fat".to_string());
-                rustflags.push("-C codegen-units=1".to_string());
-                rustflags.push("-C embed-bitcode=yes".to_string());
+                cargo.arg("--config=profile.release.codegen-units=1");
+                cargo.arg("--config=profile.release.lto=true");
             } else {
+                cargo.arg("--config=profile.release.debug=2");
                 rustflags.push("-C link-arg=-Tdefmt.x".to_string());
-                rustflags.push("-C debuginfo=2".to_string());
-                rustflags.push("-C strip=none".to_string());
             }
         }
         if let Some(level) = self.opt_level {
-            rustflags.push(format!("-C opt-level={level}"));
+            cargo.arg(format!("--config=profile.release.opt-level={level}"));
         }
         if main.release {
             features.push("release".to_string());