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

Minor Optimization and fix for bintalk-manifests (#643)

Browse source 
* Optimize `CratesToml::load_from_reader`: Avoid dup monomorphization
* Optimize `CratesToml::write_to_writer`: Avoid dup monomophization
* Optimize `create_if_not_exist`: Take `&path` to avoid dup monomorphization
* Fix `CratesToml::write_to_path`: Use exclusive file lock
   to prevent race conditions.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-01-04 11:37:01 +11:00 • committed by GitHub
parent 959b465d81
commit d4da4680f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
crates/binstalk-manifests/src/cargo_crates_v1.rs
View file

@ -47,14 +47,18 @@ impl CratesToml<'_> {
}
pub fn load_from_reader<R: io::Read>(mut reader: R) -> Result<Self, CratesTomlParseError> {
let mut vec = Vec::new();
reader.read_to_end(&mut vec)?;
fn inner(reader: &mut dyn io::Read) -> Result<CratesToml<'static>, CratesTomlParseError> {
let mut vec = Vec::new();
reader.read_to_end(&mut vec)?;
if vec.is_empty() {
Ok(Self::default())
} else {
toml::from_slice(&vec).map_err(CratesTomlParseError::from)
if vec.is_empty() {
Ok(CratesToml::default())
} else {
toml::from_slice(&vec).map_err(CratesTomlParseError::from)
}
}
inner(&mut reader)
}
pub fn load_from_path(path: impl AsRef<Path>) -> Result<Self, CratesTomlParseError> {
@ -81,9 +85,16 @@ impl CratesToml<'_> {
}
pub fn write_to_writer<W: io::Write>(&self, mut writer: W) -> Result<(), CratesTomlParseError> {
let data = toml::to_vec(&self)?;
writer.write_all(&data)?;
Ok(())
fn inner(
this: &CratesToml<'_>,
writer: &mut dyn io::Write,
) -> Result<(), CratesTomlParseError> {
let data = toml::to_vec(&this)?;
writer.write_all(&data)?;
Ok(())
}
inner(self, &mut writer)
}
pub fn write_to_file(&self, file: &mut File) -> Result<(), CratesTomlParseError> {
@ -95,7 +106,7 @@ impl CratesToml<'_> {
}
pub fn write_to_path(&self, path: impl AsRef<Path>) -> Result<(), CratesTomlParseError> {
let mut file = File::create(path)?;
let mut file = FileLock::new_exclusive(File::create(path)?)?;
self.write_to_file(&mut file)
}

4
crates/binstalk-manifests/src/helpers.rs
View file

@ -1,9 +1,7 @@
use std::{fs, io, path::Path};
/// Returned file is readable and writable.
pub(crate) fn create_if_not_exist(path: impl AsRef<Path>) -> io::Result<fs::File> {
let path = path.as_ref();
pub(crate) fn create_if_not_exist(path: &Path) -> io::Result<fs::File> {
let mut options = fs::File::options();
options.read(true).write(true);