actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-05-07 20:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize: Avoid double spawn if no_confirm

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-19 12:06:16 +10:00
parent de7ecad32c
commit 2bf7640729
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
1 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/main.rs
View file

@ -251,23 +251,23 @@ async fn entry() -> Result<()> {
let temp_dir_path: Arc<Path> = Arc::from(temp_dir.path()); let temp_dir_path: Arc<Path> = Arc::from(temp_dir.path());
// Resolve crates
let tasks: Vec<_> = crate_names
.into_iter()
.map(|crate_name| {
tokio::spawn(resolve(
opts.clone(),
crate_name,
desired_targets.clone(),
cli_overrides.clone(),
temp_dir_path.clone(),
install_path.clone(),
client.clone(),
))
})
.collect();
let tasks: Vec<_> = if !opts.dry_run && !opts.no_confirm { let tasks: Vec<_> = if !opts.dry_run && !opts.no_confirm {
// Resolve crates
let tasks: Vec<_> = crate_names
.into_iter()
.map(|crate_name| {
tokio::spawn(resolve(
opts.clone(),
crate_name,
desired_targets.clone(),
cli_overrides.clone(),
temp_dir_path.clone(),
install_path.clone(),
client.clone(),
))
})
.collect();
// Confirm // Confirm
let mut resolutions = Vec::with_capacity(tasks.len()); let mut resolutions = Vec::with_capacity(tasks.len());
for task in tasks { for task in tasks {
@ -290,17 +290,31 @@ async fn entry() -> Result<()> {
}) })
.collect() .collect()
} else { } else {
// Install without confirm // Resolve crates and install without confirmation
tasks crate_names
.into_iter() .into_iter()
.map(|task| { .map(|crate_name| {
let opts = opts.clone(); let opts = opts.clone();
let temp_dir_path = temp_dir_path.clone(); let temp_dir_path = temp_dir_path.clone();
let desired_target = desired_targets.clone(); let desired_target = desired_targets.clone();
let jobserver_client = jobserver_client.clone(); let jobserver_client = jobserver_client.clone();
let desired_targets = desired_targets.clone();
let client = client.clone();
let cli_overrides = cli_overrides.clone();
let install_path = install_path.clone();
tokio::spawn(async move { tokio::spawn(async move {
let resolution = await_task(task).await?; let resolution = resolve(
opts.clone(),
crate_name,
desired_targets.clone(),
cli_overrides,
temp_dir_path.clone(),
install_path,
client,
)
.await?;
install( install(
resolution, resolution,
opts, opts,