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

Optimize applying PkgOverrides into PkgMeta (#429)

Browse source 
* Refactor: Rm `PkgMeta::clone_without_overrides`
* Impl new fn `PkgMeta::merge_overrides` to avoid unnecessary clone

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-09-26 16:05:14 +10:00 • committed by GitHub
parent 417143e44d
commit b8d2184ee9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/binstalk/src/ops/resolve.rs
View file

@ -1,6 +1,7 @@
use std::{
borrow::Cow,
collections::BTreeSet,
iter, mem,
path::{Path, PathBuf},
sync::Arc,
};
@ -169,7 +170,7 @@ async fn resolve_inner(
}
}
let (meta, mut binaries) = (
let (mut meta, mut binaries) = (
package
.metadata
.as_ref()
@ -189,19 +190,17 @@ async fn resolve_inner(
let mut handles: Vec<(Arc<dyn Fetcher>, _)> = Vec::with_capacity(desired_targets.len() * 2);
let overrides = mem::take(&mut meta.overrides);
handles.extend(
desired_targets
.iter()
.map(|target| {
debug!("Building metadata for target: {target}");
let mut target_meta = meta.clone_without_overrides();
// Merge any overrides
if let Some(o) = meta.overrides.get(target) {
target_meta.merge(o);
}
let target_meta = meta
.merge_overrides(iter::once(&opts.cli_overrides).chain(overrides.get(target)));
target_meta.merge(&opts.cli_overrides);
debug!("Found metadata: {target_meta:?}");
Arc::new(Data {