actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-24 22:30:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize Download::and_visit_tar: Use trait object to avoid monomorphization (#644)

Browse source 
by removing method `TarEntriesVisitor::finish` and associated type
`TarEntriesVisitor::Target`.

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

10
crates/binstalk/src/drivers/crates_io.rs
View file

@ -52,7 +52,11 @@ pub async fn fetch_crate_cratesio(
let manifest_dir_path: PathBuf = format!("{name}-{version_name}").into();
Ok(Download::new(client, Url::parse(&crate_url)?)
.and_visit_tar(TarBasedFmt::Tgz, ManifestVisitor::new(manifest_dir_path))
.await?)
let mut manifest_visitor = ManifestVisitor::new(manifest_dir_path);
Download::new(client, Url::parse(&crate_url)?)
.and_visit_tar(TarBasedFmt::Tgz, &mut manifest_visitor)
.await?;
manifest_visitor.load_manifest()
}

35
crates/binstalk/src/drivers/crates_io/visitor.rs
View file

@ -1,7 +1,4 @@
use std::{
io,
path::{Path, PathBuf},
};
use std::path::{Path, PathBuf};
use cargo_toml::{Manifest, Value};
use normalize_path::NormalizePath;
@ -37,8 +34,6 @@ impl ManifestVisitor {
#[async_trait::async_trait]
impl TarEntriesVisitor for ManifestVisitor {
type Target = Manifest<Meta>;
async fn visit(&mut self, entry: &mut dyn TarEntry) -> Result<(), DownloadError> {
let path = entry.path()?;
let path = path.normalize();
@ -70,22 +65,20 @@ impl TarEntriesVisitor for ManifestVisitor {
Ok(())
}
}
impl ManifestVisitor {
/// Load binstall metadata using the extracted information stored in memory.
fn finish(self) -> Result<Self::Target, DownloadError> {
Ok(load_manifest(&self.cargo_toml_content, &self.vfs).map_err(io::Error::from)?)
pub(super) fn load_manifest(self) -> Result<Manifest<Meta>, BinstallError> {
debug!("Loading manifest directly from extracted file");
// Load and parse manifest
let mut manifest = Manifest::from_slice_with_metadata(&self.cargo_toml_content)?;
// Checks vfs for binary output names
manifest.complete_from_abstract_filesystem::<Value, _>(&self.vfs, None)?;
// Return metadata
Ok(manifest)
}
}
fn load_manifest(slice: &[u8], vfs: &Vfs) -> Result<Manifest<Meta>, BinstallError> {
debug!("Loading manifest directly from extracted file");
// Load and parse manifest
let mut manifest = Manifest::from_slice_with_metadata(slice)?;
// Checks vfs for binary output names
manifest.complete_from_abstract_filesystem::<Value, _>(vfs, None)?;
// Return metadata
Ok(manifest)
}