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

Optimize CratesToml: Use Vec instead of BTreeSet

Browse source 
for storing bins.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-26 13:43:30 +10:00
parent e86239f9be
commit 03c8295cd8
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/binstall.rs
View file

@ -1,4 +1,3 @@
use std::collections::BTreeSet;
use std::path::PathBuf; use std::path::PathBuf;
use crate::{metafiles, DesiredTargets, PkgOverride}; use crate::{metafiles, DesiredTargets, PkgOverride};
@ -20,7 +19,7 @@ pub struct Options {
/// MetaData required to update MetaFiles. /// MetaData required to update MetaFiles.
pub struct MetaData { pub struct MetaData {
pub bins: BTreeSet<String>, pub bins: Vec<String>,
pub cvs: metafiles::CrateVersionSource, pub cvs: metafiles::CrateVersionSource,
pub version_req: String, pub version_req: String,
pub target: String, pub target: String,

10
src/metafiles/v1.rs
View file

@ -1,5 +1,5 @@
use std::{ use std::{
collections::{BTreeMap, BTreeSet}, collections::BTreeMap,
fs::File, fs::File,
io::{self, Seek}, io::{self, Seek},
iter::IntoIterator, iter::IntoIterator,
@ -15,7 +15,7 @@ use crate::{cargo_home, create_if_not_exist, FileLock};
#[derive(Clone, Debug, Default, Deserialize, Serialize)] #[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct CratesToml { pub struct CratesToml {
v1: BTreeMap<String, BTreeSet<String>>, v1: BTreeMap<String, Vec<String>>,
} }
impl CratesToml { impl CratesToml {
@ -38,7 +38,7 @@ impl CratesToml {
Self::load_from_reader(file) Self::load_from_reader(file)
} }
pub fn insert(&mut self, cvs: &CrateVersionSource, bins: BTreeSet<String>) { pub fn insert(&mut self, cvs: &CrateVersionSource, bins: Vec<String>) {
self.v1.insert(cvs.to_string(), bins); self.v1.insert(cvs.to_string(), bins);
} }
@ -70,7 +70,7 @@ impl CratesToml {
iter: Iter, iter: Iter,
) -> Result<(), CratesTomlParseError> ) -> Result<(), CratesTomlParseError>
where where
Iter: IntoIterator<Item = (&'a CrateVersionSource, BTreeSet<String>)>, Iter: IntoIterator<Item = (&'a CrateVersionSource, Vec<String>)>,
{ {
let mut file = FileLock::new_exclusive(create_if_not_exist(path.as_ref())?)?; let mut file = FileLock::new_exclusive(create_if_not_exist(path.as_ref())?)?;
let mut c1 = Self::load_from_reader(&mut *file)?; let mut c1 = Self::load_from_reader(&mut *file)?;
@ -87,7 +87,7 @@ impl CratesToml {
pub fn append<'a, Iter>(iter: Iter) -> Result<(), CratesTomlParseError> pub fn append<'a, Iter>(iter: Iter) -> Result<(), CratesTomlParseError>
where where
Iter: IntoIterator<Item = (&'a CrateVersionSource, BTreeSet<String>)>, Iter: IntoIterator<Item = (&'a CrateVersionSource, Vec<String>)>,
{ {
Self::append_to_path(Self::default_path()?, iter) Self::append_to_path(Self::default_path()?, iter)
} }