From 3f99d23010a361923933db81cd83c75d73c44988 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Tue, 23 Jul 2024 23:37:56 +1000 Subject: [PATCH] Fix order of override: cli options alwayus takes precedence Signed-off-by: Jiahao XU --- crates/binstalk/src/ops/resolve.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/binstalk/src/ops/resolve.rs b/crates/binstalk/src/ops/resolve.rs index b23fde56..426e478b 100644 --- a/crates/binstalk/src/ops/resolve.rs +++ b/crates/binstalk/src/ops/resolve.rs @@ -88,10 +88,6 @@ async fn resolve_inner( return Ok(Resolution::AlreadyUpToDate); }; - let meta = package_info - .meta - .merge_overrides(iter::once(&opts.cli_overrides)); - let desired_targets = opts .desired_targets .get() @@ -100,7 +96,9 @@ async fn resolve_inner( .map(|target| { debug!("Building metadata for target: {target}"); - let meta = meta.merge_overrides(package_info.overrides.get(target)); + let meta = package_info.meta.merge_overrides( + iter::once(&opts.cli_overrides).chain(package_info.overrides.get(target)), + ); debug!("Found metadata: {meta:?}"); @@ -246,6 +244,10 @@ async fn resolve_inner( return Err(BinstallError::NoFallbackToCargoInstall); } + let meta = package_info + .meta + .merge_overrides(iter::once(&opts.cli_overrides)); + let target_meta = desired_targets .first() .map(|target_data| &target_data.meta)