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

Merge pull request #222 from NobodyXu/refactor

Browse source 
Refactor: Make appending to metafiles easier and fix their err handling
This commit is contained in:
Jiahao XU 2022-07-22 11:29:12 +10:00 • committed by GitHub
commit adbc587f3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 78 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/binstall/install.rs
View file

@ -108,29 +108,21 @@ async fn install_from_package(
let bins: BTreeSet<String> = bin_files.into_iter().map(|bin| bin.base_name).collect();
{
debug!("Writing .crates.toml");
let mut c1 = metafiles::v1::CratesToml::load().unwrap_or_default();
c1.insert(cvs.clone(), bins.clone());
c1.write()?;
}
debug!("Writing .crates.toml");
metafiles::v1::CratesToml::append(&cvs, bins.clone())?;
{
debug!("Writing .crates2.json");
let mut c2 = metafiles::v2::Crates2Json::load().unwrap_or_default();
c2.insert(
cvs,
metafiles::v2::CrateInfo {
version_req: Some(version),
bins,
profile: "release".into(),
target: fetcher.target().to_string(),
rustc: format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")),
..Default::default()
},
);
c2.write()?;
}
debug!("Writing .crates2.json");
metafiles::v2::Crates2Json::append(
&cvs,
metafiles::v2::CrateInfo {
version_req: Some(version),
bins,
profile: "release".into(),
target: fetcher.target().to_string(),
rustc: format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")),
..Default::default()
},
)?;
Ok(())
})