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

Refactor: Reduce params of install_from_package

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

20
src/main.rs
View file

@ -576,10 +576,13 @@ async fn install(
bin_path, bin_path,
bin_files, bin_files,
} => { } => {
install_from_package( let cvs = metafiles::CrateVersionSource {
fetcher, opts, package, name, temp_dir, version, bin_path, bin_files, name,
) version: package.version.parse().into_diagnostic()?,
.await source: metafiles::Source::cratesio_registry(),
};
install_from_package(fetcher, opts, cvs, temp_dir, version, bin_path, bin_files).await
} }
Resolution::InstallFromSource { package } => { Resolution::InstallFromSource { package } => {
let desired_targets = desired_targets.get().await; let desired_targets = desired_targets.get().await;
@ -604,8 +607,7 @@ async fn install(
async fn install_from_package( async fn install_from_package(
fetcher: Arc<dyn Fetcher>, fetcher: Arc<dyn Fetcher>,
opts: Arc<Options>, opts: Arc<Options>,
package: Package<Meta>, cvs: metafiles::CrateVersionSource,
name: String,
temp_dir: Arc<Path>, temp_dir: Arc<Path>,
version: String, version: String,
bin_path: PathBuf, bin_path: PathBuf,
@ -647,12 +649,6 @@ async fn install_from_package(
return Ok(()); return Ok(());
} }
let cvs = metafiles::CrateVersionSource {
name: name.clone(),
version: package.version.parse().into_diagnostic()?,
source: metafiles::Source::cratesio_registry(),
};
info!("Installing binaries..."); info!("Installing binaries...");
block_in_place(|| { block_in_place(|| {
for file in &bin_files { for file in &bin_files {