actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-07 19:26:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimize binstalk-{manifest, types} (#610)

Browse source 
* Add new dep maybe-owned v0.3.4 to binstalk-types with features serde
* Re-export maybe_owned in binstalk-types
* Optimize `CrateSource::url`: Use `MaybeOwned<'static, Url>`
   to avoid cloning in `CrateSource::cratesio_registry`
* Optimize `Source`: Use `MaybeOwned<'static, Url>`
   to avoid cloning in `Source::cratesio_registry` and
   `impl From<&CrateSource> for Source`.
* Optimize `Source`: Add lifetime `<'a>` to avoid cloning
   in `impl<'a> From<&'a CrateSource> for Source<'a>`
* Optimize `CratesToml::append_to_path`: Avoid cloning
   caused by `CrateVersionSource::from` by manually `format!` name, version
   and source into string.
* Add new dep beef v0.5.2 to binstalk-manifests with features impl_serde
* Optimize `CratesToml::append_to_path`: Eliminate `metadata.bins.clone()` by using `Cow`
* Replace dep toml_edit with toml v0.5.10 in binstalk-manifests
   to speed up compilation and reduce bloat.
   
   Previously we switch to toml_edit because it is unmaintained, but now
   with it moved into toml-rs/toml as a workspace, it is now under active
   maintenance again, thus we switch back to it.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-12-21 17:07:04 +11:00 • committed by GitHub
parent e519409ad8
commit fef8bb6774
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 76 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

42
crates/binstalk-manifests/src/cargo_crates_v1/crate_version_source.rs
View file

@ -1,6 +1,6 @@
use std::{borrow::Cow, fmt, str::FromStr};
use binstalk_types::crate_info::cratesio_url;
use binstalk_types::{crate_info::cratesio_url, maybe_owned::MaybeOwned};
use compact_str::CompactString;
use miette::Diagnostic;
use semver::Version;
@ -14,37 +14,45 @@ use crate::crate_info::{CrateInfo, CrateSource, SourceType};
pub struct CrateVersionSource {
pub name: CompactString,
pub version: Version,
pub source: Source,
pub source: Source<'static>,
}
impl From<&CrateInfo> for CrateVersionSource {
fn from(metadata: &CrateInfo) -> Self {
use SourceType::*;
let url = metadata.source.url.clone();
super::CrateVersionSource {
name: metadata.name.clone(),
version: metadata.current_version.clone(),
source: Source::from(&metadata.source),
source: match metadata.source.source_type {
Git => Source::Git(url),
Path => Source::Path(url),
Registry => Source::Registry(url),
},
}
}
}
#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
pub enum Source {
Git(Url),
Path(Url),
Registry(Url),
pub enum Source<'a> {
Git(MaybeOwned<'a, Url>),
Path(MaybeOwned<'a, Url>),
Registry(MaybeOwned<'a, Url>),
}
impl Source {
pub fn cratesio_registry() -> Source {
Self::Registry(cratesio_url().clone())
impl Source<'static> {
pub fn cratesio_registry() -> Self {
Self::Registry(MaybeOwned::Borrowed(cratesio_url()))
}
}
impl From<&CrateSource> for Source {
fn from(source: &CrateSource) -> Self {
impl<'a> From<&'a CrateSource> for Source<'a> {
fn from(source: &'a CrateSource) -> Self {
use SourceType::*;
let url = source.url.clone();
let url = MaybeOwned::Borrowed(source.url.as_ref());
match source.source_type {
Git => Self::Git(url),
@ -65,9 +73,9 @@ impl FromStr for CrateVersionSource {
.splitn(2, '+')
.collect::<Vec<_>>()[..]
{
["git", url] => Source::Git(Url::parse(url)?),
["path", url] => Source::Path(Url::parse(url)?),
["registry", url] => Source::Registry(Url::parse(url)?),
["git", url] => Source::Git(Url::parse(url)?.into()),
["path", url] => Source::Path(Url::parse(url)?.into()),
["registry", url] => Source::Registry(Url::parse(url)?.into()),
[kind, arg] => {
return Err(CvsParseError::UnknownSourceType {
kind: kind.to_string().into_boxed_str(),
@ -117,7 +125,7 @@ impl fmt::Display for CrateVersionSource {
}
}
impl fmt::Display for Source {
impl fmt::Display for Source<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Source::Git(url) => write!(f, "git+{url}"),