From 1ecaeb29aa798f591f6488dc6c3a7a8d22f6073e Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 18 Nov 2022 13:12:50 -0300 Subject: [PATCH] fix(cli): inject config feature flags when features arg is not provided --- .changes/fix-config-features.md | 6 ++++++ tooling/cli/src/build.rs | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .changes/fix-config-features.md diff --git a/.changes/fix-config-features.md b/.changes/fix-config-features.md new file mode 100644 index 000000000..80e37c03a --- /dev/null +++ b/.changes/fix-config-features.md @@ -0,0 +1,6 @@ +--- +"cli.rs": patch +"cli.js": patch +--- + +Fixes injection of Cargo features defined in the configuration file. diff --git a/tooling/cli/src/build.rs b/tooling/cli/src/build.rs index eff3adef9..24970604d 100644 --- a/tooling/cli/src/build.rs +++ b/tooling/cli/src/build.rs @@ -157,9 +157,10 @@ pub fn command(mut options: Options) -> Result<()> { options.runner = config_.build.runner.clone(); } - if let Some(list) = options.features.as_mut() { - list.extend(config_.build.features.clone().unwrap_or_default()); - } + options + .features + .get_or_insert(Vec::new()) + .extend(config_.build.features.clone().unwrap_or_default()); let bin_path = app_settings.app_binary_path(&interface_options)?; let out_dir = bin_path.parent().unwrap();