From a3fcc298abfd13dcbf58cbf075d7bdac0b2b1d9d Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Fri, 22 Jul 2022 01:38:44 +1000 Subject: [PATCH] Avoid `CrateVersionSource::clone` for insertion in `metafiles` Signed-off-by: Jiahao XU --- src/binstall/install.rs | 4 ++-- src/metafiles/v1.rs | 6 +++--- src/metafiles/v2.rs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/binstall/install.rs b/src/binstall/install.rs index 677423c9..2efeef4b 100644 --- a/src/binstall/install.rs +++ b/src/binstall/install.rs @@ -110,11 +110,11 @@ async fn install_from_package( let bins: BTreeSet = bin_files.into_iter().map(|bin| bin.base_name).collect(); debug!("Writing .crates.toml"); - metafiles::v1::CratesToml::append(cvs.clone(), bins.clone())?; + metafiles::v1::CratesToml::append(&cvs, bins.clone())?; debug!("Writing .crates2.json"); metafiles::v2::Crates2Json::append( - cvs, + &cvs, metafiles::v2::CrateInfo { version_req: Some(version), bins, diff --git a/src/metafiles/v1.rs b/src/metafiles/v1.rs index 414155a9..7e0d9a2f 100644 --- a/src/metafiles/v1.rs +++ b/src/metafiles/v1.rs @@ -30,7 +30,7 @@ impl CratesToml { Self::from_str(&file) } - pub fn insert(&mut self, cvs: CrateVersionSource, bins: BTreeSet) { + pub fn insert(&mut self, cvs: &CrateVersionSource, bins: BTreeSet) { self.v1.insert(cvs.to_string(), bins); } @@ -45,7 +45,7 @@ impl CratesToml { pub fn append_to_path( path: impl AsRef, - cvs: CrateVersionSource, + cvs: &CrateVersionSource, bins: BTreeSet, ) -> Result<(), CratesTomlParseError> { let mut c1 = match Self::load_from_path(path.as_ref()) { @@ -62,7 +62,7 @@ impl CratesToml { } pub fn append( - cvs: CrateVersionSource, + cvs: &CrateVersionSource, bins: BTreeSet, ) -> Result<(), CratesTomlParseError> { Self::append_to_path(Self::default_path()?, cvs, bins) diff --git a/src/metafiles/v2.rs b/src/metafiles/v2.rs index 0db24f14..9f77af2d 100644 --- a/src/metafiles/v2.rs +++ b/src/metafiles/v2.rs @@ -51,7 +51,7 @@ impl Crates2Json { Ok(serde_json::from_reader(file)?) } - pub fn insert(&mut self, cvs: CrateVersionSource, info: CrateInfo) { + pub fn insert(&mut self, cvs: &CrateVersionSource, info: CrateInfo) { self.installs.insert(cvs.to_string(), info); } @@ -67,7 +67,7 @@ impl Crates2Json { pub fn append_to_path( path: impl AsRef, - cvs: CrateVersionSource, + cvs: &CrateVersionSource, info: CrateInfo, ) -> Result<(), Crates2JsonParseError> { let mut c2 = match Self::load_from_path(path.as_ref()) { @@ -83,7 +83,7 @@ impl Crates2Json { Ok(()) } - pub fn append(cvs: CrateVersionSource, info: CrateInfo) -> Result<(), Crates2JsonParseError> { + pub fn append(cvs: &CrateVersionSource, info: CrateInfo) -> Result<(), Crates2JsonParseError> { Self::append_to_path(Self::default_path()?, cvs, info) } }