diff options
Diffstat (limited to 'crates/shirabe/src/package')
10 files changed, 38 insertions, 71 deletions
diff --git a/crates/shirabe/src/package/alias_package.rs b/crates/shirabe/src/package/alias_package.rs index fcefcc63..ef503b16 100644 --- a/crates/shirabe/src/package/alias_package.rs +++ b/crates/shirabe/src/package/alias_package.rs @@ -59,7 +59,7 @@ impl AliasPackage { pub fn new(alias_of: PackageHandle, version: String, pretty_version: String) -> Self { let alias_name = alias_of.get_name(); - let stability = VersionParser::parse_stability(&version).to_string(); + let stability = VersionParser::parse_stability(&version); let dev = stability == "dev"; let mut this = Self { @@ -132,7 +132,7 @@ impl AliasPackage { // for self.version requirements, we use the original package's branch name instead, to avoid leaking the magic dev-master-alias to users let mut pretty_version = self.pretty_version.clone(); if pretty_version == VersionParser::DEFAULT_BRANCH_ALIAS { - pretty_version = self.alias_of.get_pretty_version().to_string(); + pretty_version = self.alias_of.get_pretty_version(); } if in_array( diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs index 52132be9..92fe9d6c 100644 --- a/crates/shirabe/src/package/archiver/archive_manager.rs +++ b/crates/shirabe/src/package/archiver/archive_manager.rs @@ -57,7 +57,7 @@ impl ArchiveManager { package: CompletePackageInterfaceHandle, ) -> anyhow::Result<IndexMap<String, String>> { let base_name = match package.get_archive_name() { - Some(name) => name.to_string(), + Some(name) => name, None => Preg::replace(php_regex!("#[^a-z0-9-_]#i"), "-", &package.get_name()), }; @@ -69,20 +69,14 @@ impl ArchiveManager { if Preg::is_match(php_regex!("{^[a-f0-9]{40}$}"), dist_ref) { parts.insert("dist_reference".to_string(), dist_ref.to_string()); if let Some(dist_type) = package.get_dist_type() { - parts.insert("dist_type".to_string(), dist_type.to_string()); + parts.insert("dist_type".to_string(), dist_type); } } else { - parts.insert( - "version".to_string(), - package.get_pretty_version().to_string(), - ); + parts.insert("version".to_string(), package.get_pretty_version()); parts.insert("dist_reference".to_string(), dist_ref.to_string()); } } else { - parts.insert( - "version".to_string(), - package.get_pretty_version().to_string(), - ); + parts.insert("version".to_string(), package.get_pretty_version()); } if let Some(source_reference) = package.get_source_reference() { @@ -128,10 +122,7 @@ impl ArchiveManager { let mut usable_archiver_idx: Option<usize> = None; for (i, archiver) in self.archivers.iter().enumerate() { - if archiver.supports( - format.clone(), - package.get_source_type().map(|s| s.to_string()), - ) { + if archiver.supports(format.clone(), package.get_source_type()) { usable_archiver_idx = Some(i); break; } diff --git a/crates/shirabe/src/package/dumper/array_dumper.rs b/crates/shirabe/src/package/dumper/array_dumper.rs index 85021a87..303a5871 100644 --- a/crates/shirabe/src/package/dumper/array_dumper.rs +++ b/crates/shirabe/src/package/dumper/array_dumper.rs @@ -32,39 +32,30 @@ impl ArrayDumper { let mut data: IndexMap<String, PhpMixed> = IndexMap::new(); data.insert( "name".to_string(), - PhpMixed::String(package.get_pretty_name().to_string()), + PhpMixed::String(package.get_pretty_name()), ); data.insert( "version".to_string(), - PhpMixed::String(package.get_pretty_version().to_string()), + PhpMixed::String(package.get_pretty_version()), ); data.insert( "version_normalized".to_string(), - PhpMixed::String(package.get_version().to_string()), + PhpMixed::String(package.get_version()), ); if let Some(target_dir) = package.get_target_dir() { - data.insert( - "target-dir".to_string(), - PhpMixed::String(target_dir.to_string()), - ); + data.insert("target-dir".to_string(), PhpMixed::String(target_dir)); } if let Some(source_type) = package.get_source_type() { let mut source = IndexMap::new(); - source.insert( - "type".to_string(), - PhpMixed::String(source_type.to_string()), - ); + source.insert("type".to_string(), PhpMixed::String(source_type)); source.insert( "url".to_string(), PhpMixed::String(package.get_source_url().unwrap_or_default()), ); if let Some(reference) = package.get_source_reference() { - source.insert( - "reference".to_string(), - PhpMixed::String(reference.to_string()), - ); + source.insert("reference".to_string(), PhpMixed::String(reference)); } if let Some(mirrors) = package.get_source_mirrors() && !mirrors.is_empty() @@ -79,19 +70,16 @@ impl ArrayDumper { if let Some(dist_type) = package.get_dist_type() { let mut dist: IndexMap<String, PhpMixed> = IndexMap::new(); - dist.insert("type".to_string(), PhpMixed::String(dist_type.to_string())); + dist.insert("type".to_string(), PhpMixed::String(dist_type)); dist.insert( "url".to_string(), PhpMixed::String(package.get_dist_url().unwrap_or_default()), ); if let Some(reference) = package.get_dist_reference() { - dist.insert( - "reference".to_string(), - PhpMixed::String(reference.to_string()), - ); + dist.insert("reference".to_string(), PhpMixed::String(reference)); } if let Some(shasum) = package.get_dist_sha1_checksum() { - dist.insert("shasum".to_string(), PhpMixed::String(shasum.to_string())); + dist.insert("shasum".to_string(), PhpMixed::String(shasum)); } if let Some(mirrors) = package.get_dist_mirrors() && !mirrors.is_empty() @@ -122,7 +110,7 @@ impl ArrayDumper { let suggests = package.get_suggests(); if !suggests.is_empty() { - let mut sorted_suggests = suggests.clone(); + let mut sorted_suggests = suggests; sorted_suggests.sort_keys(); data.insert( "suggest".to_string(), @@ -156,7 +144,7 @@ impl ArrayDumper { } let pkg_type = package.get_type(); if !pkg_type.is_empty() { - data.insert("type".to_string(), PhpMixed::String(pkg_type.to_string())); + data.insert("type".to_string(), PhpMixed::String(pkg_type)); } let extra = package.get_extra(); if !extra.is_empty() { @@ -168,7 +156,7 @@ impl ArrayDumper { if let Some(installation_source) = package.get_installation_source() { data.insert( "installation-source".to_string(), - PhpMixed::String(installation_source.to_string()), + PhpMixed::String(installation_source), ); } let autoload = package.get_autoload(); @@ -188,7 +176,7 @@ impl ArrayDumper { if let Some(notification_url) = package.get_notification_url() { data.insert( "notification-url".to_string(), - PhpMixed::String(notification_url.to_string()), + PhpMixed::String(notification_url), ); } let include_paths = package.get_include_paths(); @@ -217,10 +205,7 @@ impl ArrayDumper { .entry("archive".to_string()) .or_insert_with(|| PhpMixed::Array(IndexMap::new())); if let PhpMixed::Array(archive) = entry { - archive.insert( - "name".to_string(), - PhpMixed::String(archive_name.to_string()), - ); + archive.insert("name".to_string(), PhpMixed::String(archive_name)); } } let archive_excludes = complete_pkg.get_archive_excludes(); @@ -282,16 +267,10 @@ impl ArrayDumper { ); } if let Some(description) = complete_pkg.get_description() { - data.insert( - "description".to_string(), - PhpMixed::String(description.to_string()), - ); + data.insert("description".to_string(), PhpMixed::String(description)); } if let Some(homepage) = complete_pkg.get_homepage() { - data.insert( - "homepage".to_string(), - PhpMixed::String(homepage.to_string()), - ); + data.insert("homepage".to_string(), PhpMixed::String(homepage)); } let mut keywords = complete_pkg.get_keywords(); if !keywords.is_empty() { @@ -336,7 +315,7 @@ impl ArrayDumper { if complete_pkg.is_abandoned() { let abandoned_value = complete_pkg .get_replacement_package() - .map(|r| PhpMixed::String(r.to_string())) + .map(PhpMixed::String) .unwrap_or(PhpMixed::Bool(true)); data.insert("abandoned".to_string(), abandoned_value); } @@ -347,7 +326,7 @@ impl ArrayDumper { if !minimum_stability.is_empty() { data.insert( "minimum-stability".to_string(), - PhpMixed::String(minimum_stability.to_string()), + PhpMixed::String(minimum_stability), ); } } diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs index da022b1b..9ab7d583 100644 --- a/crates/shirabe/src/package/loader/validating_array_loader.rs +++ b/crates/shirabe/src/package/loader/validating_array_loader.rs @@ -650,7 +650,7 @@ impl LoaderInterface for ValidatingArrayLoader { v.as_array().unwrap().clone() } else { let mut m = IndexMap::new(); - m.insert("0".to_string(), v.clone()); + m.insert("0".to_string(), v); m }; diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index a2f3c0c9..02cbfa4a 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -831,11 +831,8 @@ impl Locker { let no_show_signature_flags = GitUtil::get_no_show_signature_flags(&self.process); - let mut args: Vec<String> = vec![ - "-n1".to_string(), - "--format=%ct".to_string(), - source_ref.clone(), - ]; + let mut args: Vec<String> = + vec!["-n1".to_string(), "--format=%ct".to_string(), source_ref]; args.extend(no_show_signature_flags); let command = GitUtil::build_rev_list_command(&self.process, args); let mut output = PhpMixed::Null; @@ -866,7 +863,7 @@ impl Locker { PhpMixed::String("--template".to_string()), PhpMixed::String("{date|hgdate}".to_string()), PhpMixed::String("-r".to_string()), - PhpMixed::String(source_ref.clone()), + PhpMixed::String(source_ref), ]), &mut output, path.as_deref(), diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index ea415b9c..bc99d08a 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -71,7 +71,7 @@ pub struct Package { impl Package { /// Creates a new in memory package. pub fn new(name: String, version: String, pretty_version: String) -> Self { - let stability = VersionParser::parse_stability(&version).to_string(); + let stability = VersionParser::parse_stability(&version); let dev = stability == "dev"; Self { id: -1, @@ -459,7 +459,7 @@ impl Package { self.version = version; self.pretty_version = pretty_version; - self.stability = VersionParser::parse_stability(&self.version).to_string(); + self.stability = VersionParser::parse_stability(&self.version); self.dev = self.stability == "dev"; } diff --git a/crates/shirabe/src/package/version/version_bumper.rs b/crates/shirabe/src/package/version/version_bumper.rs index e1f58942..cd52e9a4 100644 --- a/crates/shirabe/src/package/version/version_bumper.rs +++ b/crates/shirabe/src/package/version/version_bumper.rs @@ -26,11 +26,11 @@ impl VersionBumper { return Ok(pretty_constraint); } - let mut version = package.get_version().to_string(); + let mut version = package.get_version(); if version.starts_with("dev-") { let loader = ArrayLoader::new(Some(parser.clone()), false); let dumper = ArrayDumper::new(); - let dumped = dumper.dump(package.clone()); + let dumped = dumper.dump(package); let extra = loader.get_branch_alias(&dumped)?; if extra.is_none() || extra.as_deref() == Some(VersionParser::DEFAULT_BRANCH_ALIAS) { diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index 2f98e339..d7dc42eb 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -414,7 +414,7 @@ impl VersionGuesser { if VersionParser::DEFAULT_BRANCH_ALIAS == version { return Ok(Some(VersionData { - version: Some(version.clone()), + version: Some(version), commit: None, pretty_version: Some(format!("dev-{}", branch)), feature_version: None, diff --git a/crates/shirabe/src/package/version/version_parser.rs b/crates/shirabe/src/package/version/version_parser.rs index 8cf3aa72..4aecc834 100644 --- a/crates/shirabe/src/package/version/version_parser.rs +++ b/crates/shirabe/src/package/version/version_parser.rs @@ -130,7 +130,7 @@ impl VersionParser { return Ok(true); } - let sorted = Semver::sort(vec![normalized_to.clone(), normalized_from.clone()])?; + let sorted = Semver::sort(vec![normalized_to, normalized_from.clone()])?; Ok(sorted[0] == normalized_from) } diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs index e8539212..bf5514a5 100644 --- a/crates/shirabe/src/package/version/version_selector.rs +++ b/crates/shirabe/src/package/version/version_selector.rs @@ -98,7 +98,7 @@ impl VersionSelector { }; let mut candidates = self.repository_set.borrow().find_packages( &strtolower(package_name), - constraint.clone(), + constraint, repo_set_flags, )?; @@ -273,7 +273,7 @@ impl VersionSelector { } } - let version = package.get_version().to_string(); + let version = package.get_version(); if !package.is_dev() { return self.transform_version( &version, @@ -299,7 +299,7 @@ impl VersionSelector { } } - Ok(package.get_pretty_version().to_string()) + Ok(package.get_pretty_version()) } fn transform_version( |