actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-19 17:16:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Rm uninstalled crates from binstall/crates-v1.json (#2197)

Browse source 
* Add Records::retain

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Sync with cargo manifest

Rm uninstalled crates

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix entry.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Test manifest syncing in e2e-tests/live.sh

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix binstall_crates_v1.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix crates_manifests.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix binstall_crates_v1.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix entry.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix clippy in entry.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix fmt in entry.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix fmt in crates_manifests.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

* Fix fmt in crates_manifests.rs

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>

---------

Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
This commit is contained in:
Jiahao XU 2025-06-17 09:55:42 +10:00 • committed by GitHub
parent 820d73f95a
commit e4d731dcc1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/binstalk-manifests/src/binstall_crates_v1.rs
View file

@ -214,6 +214,11 @@ impl Records {
self.data.remove(value.as_ref())
}
/// Remove crates that `f(&data.crate_info)` returns `false`.
pub fn retain(&mut self, mut f: impl FnMut(&CrateInfo) -> bool) {
self.data.retain(|data| f(&data.crate_info))
}
pub fn take(&mut self, value: impl AsRef<str>) -> Option<CrateInfo> {
self.data.take(value.as_ref()).map(CrateInfo::from)
}

21
crates/binstalk-manifests/src/crates_manifests.rs
View file

@ -35,6 +35,7 @@ pub enum ManifestsError {
pub struct Manifests {
binstall: BinstallCratesV1Records,
cargo_crates_v1: FileLock,
installed_crates: BTreeMap<CompactString, Version>,
}
impl Manifests {
@ -43,16 +44,22 @@ impl Manifests {
let metadata_path = cargo_roots.join("binstall/crates-v1.json");
fs::create_dir_all(metadata_path.parent().unwrap())?;
let binstall = BinstallCratesV1Records::load_from_path(&metadata_path)?;
let mut binstall = BinstallCratesV1Records::load_from_path(&metadata_path)?;
// Read cargo_install_v1_metadata
let manifest_path = cargo_roots.join(".crates.toml");
let cargo_crates_v1 = create_if_not_exist(&manifest_path)?;
let mut cargo_crates_v1 = create_if_not_exist(&manifest_path)?;
let installed_crates = CratesToml::load_from_reader(&mut cargo_crates_v1)
.and_then(CratesToml::collect_into_crates_versions)?;
binstall.retain(|crate_info| installed_crates.contains_key(&crate_info.name));
Ok(Self {
binstall,
cargo_crates_v1,
installed_crates,
})
}
@ -64,14 +71,8 @@ impl Manifests {
/// but it only updates .crates.toml.
///
/// So here we will honour .crates.toml only.
pub fn load_installed_crates(
&mut self,
) -> Result<BTreeMap<CompactString, Version>, ManifestsError> {
self.rewind_cargo_crates_v1()?;
CratesToml::load_from_reader(&mut self.cargo_crates_v1)
.and_then(CratesToml::collect_into_crates_versions)
.map_err(ManifestsError::from)
pub fn installed_crates(&self) -> &BTreeMap<CompactString, Version> {
&self.installed_crates
}
pub fn update(mut self, metadata_vec: Vec<CrateInfo>) -> Result<(), ManifestsError> {