actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-15 15:16:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compute cli_overrides in args::parse

Browse source 
Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
This commit is contained in:
Jiahao XU 2024-08-03 13:07:38 +10:00 • committed by GitHub
parent 85f244fe97
commit 8f21c16947
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/bin/src/args.rs
View file

@ -13,7 +13,7 @@ use binstalk::{
ops::resolve::{CrateName, VersionReqExt},
registry::Registry,
};
use binstalk_manifests::cargo_toml_binstall::Strategy;
use binstalk_manifests::cargo_toml_binstall::{PkgOverride, Strategy};
use clap::{builder::PossibleValue, error::ErrorKind, CommandFactory, Parser, ValueEnum};
use compact_str::CompactString;
use log::LevelFilter;
@ -464,7 +464,7 @@ impl ValueEnum for StrategyWrapped {
}
}
pub fn parse() -> Args {
pub fn parse() -> (Args, PkgOverride) {
// Filter extraneous arg when invoked by cargo
// `cargo run -- --help` gives ["target/debug/cargo-binstall", "--help"]
// `cargo binstall --help` gives ["/home/ryan/.cargo/bin/cargo-binstall", "binstall", "--help"]
@ -561,6 +561,8 @@ You cannot use --{option} and specify multiple packages at the same time. Do one
}
}
let has_strategy_override = !opts.overrides.is_empty();
// Default strategies if empty
if opts.strategies.is_empty() {
opts.strategies = vec![
@ -611,7 +613,22 @@ You cannot use --{option} and specify multiple packages at the same time. Do one
_ => (),
}
opts
(
opts,
PkgOverride {
pkg_url: opts.pkg_url,
pkg_fmt: opts.pkg_fmt,
bin_dir: opts.bin_dir,
disabled_strategies: (!opts.disable_strategies.is_empty() || has_strategy_ovrrride).then(|| {
args.disable_strategies
.into_iter()
.map(|strategy| strategy.0)
.collect::<Vec<_>>()
.into_boxed_slice()
}),
signing: None,
},
)
}
#[cfg(test)]