diff --git a/src/binstall.rs b/src/binstall.rs index 63eb70b8..d763611d 100644 --- a/src/binstall.rs +++ b/src/binstall.rs @@ -1,4 +1,3 @@ -use std::collections::BTreeSet; use std::path::PathBuf; use crate::{metafiles, DesiredTargets, PkgOverride}; @@ -20,7 +19,7 @@ pub struct Options { /// MetaData required to update MetaFiles. pub struct MetaData { - pub bins: BTreeSet, + pub bins: Vec, pub cvs: metafiles::CrateVersionSource, pub version_req: String, pub target: String, diff --git a/src/metafiles/v1.rs b/src/metafiles/v1.rs index b91f715a..713c167d 100644 --- a/src/metafiles/v1.rs +++ b/src/metafiles/v1.rs @@ -1,5 +1,5 @@ use std::{ - collections::{BTreeMap, BTreeSet}, + collections::BTreeMap, fs::File, io::{self, Seek}, iter::IntoIterator, @@ -15,7 +15,7 @@ use crate::{cargo_home, create_if_not_exist, FileLock}; #[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct CratesToml { - v1: BTreeMap>, + v1: BTreeMap>, } impl CratesToml { @@ -38,7 +38,7 @@ impl CratesToml { Self::load_from_reader(file) } - pub fn insert(&mut self, cvs: &CrateVersionSource, bins: BTreeSet) { + pub fn insert(&mut self, cvs: &CrateVersionSource, bins: Vec) { self.v1.insert(cvs.to_string(), bins); } @@ -70,7 +70,7 @@ impl CratesToml { iter: Iter, ) -> Result<(), CratesTomlParseError> where - Iter: IntoIterator)>, + Iter: IntoIterator)>, { let mut file = FileLock::new_exclusive(create_if_not_exist(path.as_ref())?)?; let mut c1 = Self::load_from_reader(&mut *file)?; @@ -87,7 +87,7 @@ impl CratesToml { pub fn append<'a, Iter>(iter: Iter) -> Result<(), CratesTomlParseError> where - Iter: IntoIterator)>, + Iter: IntoIterator)>, { Self::append_to_path(Self::default_path()?, iter) }