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

Refactor: Extract Crates2Json::append{_to_path}

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-21 19:58:23 +10:00
parent 0157a594e6
commit 1e725a9ffe
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/binstall/install.rs
View file

@ -112,10 +112,8 @@ async fn install_from_package(
debug!("Writing .crates.toml"); debug!("Writing .crates.toml");
metafiles::v1::CratesToml::append(cvs.clone(), bins.clone())?; metafiles::v1::CratesToml::append(cvs.clone(), bins.clone())?;
{
debug!("Writing .crates2.json"); debug!("Writing .crates2.json");
let mut c2 = metafiles::v2::Crates2Json::load().unwrap_or_default(); metafiles::v2::Crates2Json::append(
c2.insert(
cvs, cvs,
metafiles::v2::CrateInfo { metafiles::v2::CrateInfo {
version_req: Some(version), version_req: Some(version),
@ -125,9 +123,7 @@ async fn install_from_package(
rustc: format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")), rustc: format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")),
..Default::default() ..Default::default()
}, },
); )?;
c2.write()?;
}
Ok(()) Ok(())
}) })

16
src/metafiles/v2.rs
View file

@ -63,6 +63,22 @@ impl Crates2Json {
fs::write(path, &serde_json::to_vec(&self)?)?; fs::write(path, &serde_json::to_vec(&self)?)?;
Ok(()) Ok(())
} }
pub fn append_to_path(
path: impl AsRef<Path>,
cvs: CrateVersionSource,
info: CrateInfo,
) -> Result<(), Crates2JsonParseError> {
let mut c2 = Self::load_from_path(path.as_ref()).unwrap_or_default();
c2.insert(cvs, info);
c2.write_to_path(path.as_ref())?;
Ok(())
}
pub fn append(cvs: CrateVersionSource, info: CrateInfo) -> Result<(), Crates2JsonParseError> {
Self::append_to_path(Self::default_path()?, cvs, info)
}
} }
#[derive(Debug, Diagnostic, Error)] #[derive(Debug, Diagnostic, Error)]