diff options
Diffstat (limited to 'crates/shirabe/src/command')
18 files changed, 70 insertions, 95 deletions
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index 25d32b2b..dfbb6fc5 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -299,7 +299,7 @@ impl ArchiveCommand { None, )?; let loop_ = std::rc::Rc::new(std::cell::RefCell::new(Loop::new( - http_downloader.clone(), + http_downloader, Some(process), ))); owned_archive_manager = @@ -365,7 +365,7 @@ impl ArchiveCommand { let mut repos: Vec<crate::repository::RepositoryInterfaceHandle> = vec![local_repo]; repos.extend(repository_manager.get_repositories().iter().cloned()); repo = CompositeRepository::new(repos); - min_stability = composer.get_package().get_minimum_stability().to_string(); + min_stability = composer.get_package().get_minimum_stability(); } else { let default_repos = RepositoryFactory::default_repos_with_default_manager(io.clone())?; let repo_names: Vec<String> = default_repos.keys().cloned().collect(); @@ -410,7 +410,7 @@ impl ArchiveCommand { let parser = VersionParser::new(); let constraint: Option<shirabe_semver::constraint::AnyConstraint> = match version.as_deref() { - Some(v) => Some(parser.parse_constraints(v)?.clone()), + Some(v) => Some(parser.parse_constraints(v)?), None => None, }; let packages = repo_set.find_packages(&package_name.to_lowercase(), constraint, 0)?; diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs index c797eef1..b01b6624 100644 --- a/crates/shirabe/src/command/audit_command.rs +++ b/crates/shirabe/src/command/audit_command.rs @@ -210,7 +210,7 @@ impl Command for AuditCommand { &abandoned, ignore_severities, ignore_unreachable, - audit_config.ignore_abandoned_for_audit.clone(), + audit_config.ignore_abandoned_for_audit, )? .min(255)) } diff --git a/crates/shirabe/src/command/base_dependency_command.rs b/crates/shirabe/src/command/base_dependency_command.rs index 8b4fb148..c4399f34 100644 --- a/crates/shirabe/src/command/base_dependency_command.rs +++ b/crates/shirabe/src/command/base_dependency_command.rs @@ -240,7 +240,7 @@ pub trait BaseDependencyCommand: BaseCommand { let has_constraint = text_constraint != "*"; let constraint: Option<AnyConstraint> = if has_constraint { let version_parser = VersionParser::new(); - Some(version_parser.parse_constraints(&text_constraint)?.clone()) + Some(version_parser.parse_constraints(&text_constraint)?) } else { None }; diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs index 5852050e..fb759893 100644 --- a/crates/shirabe/src/command/check_platform_reqs_command.rs +++ b/crates/shirabe/src/command/check_platform_reqs_command.rs @@ -244,7 +244,7 @@ impl Command for CheckPlatformReqsCommand { "<info>Checking {}platform requirements for packages in the vendor dir</info>", if no_dev { "non-dev " } else { "" } )); - local_repo.clone() + local_repo } }; diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index 6d40c307..a92c2f59 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -737,7 +737,7 @@ impl Command for ConfigCommand { if 1 == values.len() { let value = strtolower(&values[0]); if boolean_validator(&PhpMixed::String(value.clone())) { - if !boolean_normalizer(&PhpMixed::String(value.clone())) + if !boolean_normalizer(&PhpMixed::String(value)) .as_bool() .unwrap_or(false) { diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index fdc01391..68024b69 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -336,7 +336,7 @@ impl CreateProjectCommand { &config, package_name, platform_requirement_filter.clone(), - directory.clone(), + directory, package_version, stability, prefer_source, @@ -948,7 +948,7 @@ impl CreateProjectCommand { let _ = mkdir(&directory, 0o777, true); let mut signal_handler: Option<SignalHandler> = None; if let Some(real_dir) = realpath(&directory) { - let real_dir_clone = real_dir.clone(); + let real_dir_clone = real_dir; let io_for_signal = io.clone(); signal_handler = Some(SignalHandler::create( vec![ @@ -994,7 +994,7 @@ impl CreateProjectCommand { dm.borrow_mut().set_prefer_source(prefer_source); dm.borrow_mut().set_prefer_dist(prefer_dist); - let project_installer = ProjectInstaller::new(&directory, dm.clone(), fs.clone()); + let project_installer = ProjectInstaller::new(&directory, dm.clone(), fs); let installation_manager = composer.get_installation_manager().clone(); let mut im = installation_manager.borrow_mut(); im.set_output_progress(!no_progress); diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs index ac15e1d1..9d0ee6f4 100644 --- a/crates/shirabe/src/command/diagnose_command.rs +++ b/crates/shirabe/src/command/diagnose_command.rs @@ -103,7 +103,7 @@ impl Command for DiagnoseCommand { let config: std::rc::Rc<std::cell::RefCell<Config>>; if let Some(ref mut c) = composer { let c = crate::composer::composer_full(c); - config = c.get_config().clone(); + config = c.get_config(); let command_event = CommandEvent::new6( PluginEvents::COMMAND, @@ -187,7 +187,7 @@ impl Command for DiagnoseCommand { crate::repository::FindPackageConstraint::String("*".to_string()), )? .unwrap(); - let mut php_version = php_pkg.get_pretty_version().to_string(); + let mut php_version = php_pkg.get_pretty_version(); if let Some(cp) = php_pkg.as_complete() && str_contains(&cp.get_description().unwrap_or_default(), "overridden") { @@ -986,11 +986,8 @@ impl DiagnoseCommand { if version != "@package_version@" { let version_parser = VersionParser::new(); let normalized_version = version_parser.normalize(&version, None)?; - let root_pkg = RootPackage::new( - "composer/composer".to_string(), - normalized_version, - version.clone(), - ); + let root_pkg = + RootPackage::new("composer/composer".to_string(), normalized_version, version); packages.push(crate::package::RootPackageHandle::from_root_package(root_pkg).into()); } let mut repo_config: IndexMap<String, PhpMixed> = IndexMap::new(); diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs index 5a823d8b..f7dca941 100644 --- a/crates/shirabe/src/command/home_command.rs +++ b/crates/shirabe/src/command/home_command.rs @@ -49,9 +49,9 @@ impl HomeCommand { let mut url: Option<String> = support .get("source") .cloned() - .or_else(|| package.get_source_url().map(|s| s.to_string())); + .or_else(|| package.get_source_url()); if url.as_deref().is_none_or(|s| s.is_empty()) || show_homepage { - url = package.get_homepage().map(|s| s.to_string()); + url = package.get_homepage(); } let url = match url { @@ -198,7 +198,7 @@ impl Command for HomeCommand { io.write_error("No package specified, opening homepage for the root package"); let composer_rc = self.require_composer(None, None)?; let composer_ref = crate::composer::composer_full(&composer_rc); - vec![composer_ref.get_package().get_name().to_string()] + vec![composer_ref.get_package().get_name()] } else { packages }; diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 6b3503b0..1ff4089a 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -307,7 +307,7 @@ impl Command for InitCommand { ); } - file_obj.write(PhpMixed::Array(options_for_encode.clone()))?; + file_obj.write(PhpMixed::Array(options_for_encode))?; let validate_result = file_obj.validate_schema(JsonFile::LAX_SCHEMA, None); if let Err(e) = validate_result { // try to downcast to JsonValidationException @@ -590,7 +590,7 @@ impl Command for InitCommand { let description = io.ask( format!( "Description [<comment>{}</comment>]: ", - description.clone().unwrap_or_default() + description.unwrap_or_default() ), description_default .map(PhpMixed::String) @@ -653,7 +653,7 @@ impl Command for InitCommand { let minimum_stability_value = io.ask_and_validate( format!( "Minimum Stability [<comment>{}</comment>]: ", - minimum_stability.clone().unwrap_or_default() + minimum_stability.unwrap_or_default() ), Box::new(move |value: PhpMixed| -> anyhow::Result<PhpMixed> { if value.is_null() { @@ -756,7 +756,7 @@ impl Command for InitCommand { // prepare to resolve dependencies let repos = self.get_repos(); let preferred_stability = - if let Some(s) = minimum_stability_default.clone().filter(|s| !s.is_empty()) { + if let Some(s) = minimum_stability_default.filter(|s| !s.is_empty()) { s } else { "stable".to_string() @@ -882,7 +882,7 @@ impl Command for InitCommand { return Err(InvalidArgumentException { message: format!( "The src folder name \"{}\" is invalid. Please add a relative path with tailing forward slash. [A-Za-z0-9_-/]+/", - value_or_default.clone(), + value_or_default, ), code: 0, } diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs index 635c1461..28855cac 100644 --- a/crates/shirabe/src/command/install_command.rs +++ b/crates/shirabe/src/command/install_command.rs @@ -236,7 +236,7 @@ impl Command for InstallCommand { ) .set_optimize_autoloader(optimize) .set_class_map_authoritative(authoritative) - .set_apcu_autoloader(apcu, apcu_prefix.clone()) + .set_apcu_autoloader(apcu, apcu_prefix) .set_platform_requirement_filter(self.get_platform_requirement_filter(input.clone())?) .set_audit_config( self.create_audit_config(&mut composer.get_config().borrow_mut(), input.clone())?, diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs index be467a13..a49e567d 100644 --- a/crates/shirabe/src/command/licenses_command.rs +++ b/crates/shirabe/src/command/licenses_command.rs @@ -249,19 +249,13 @@ impl Command for LicensesCommand { } let mut output_map: IndexMap<String, PhpMixed> = IndexMap::new(); - output_map.insert( - "name".to_string(), - PhpMixed::String(root.get_pretty_name().clone()), - ); + output_map.insert("name".to_string(), PhpMixed::String(root.get_pretty_name())); output_map.insert( "version".to_string(), - PhpMixed::String( - root.get_full_pretty_version( - true, - crate::package::DisplayMode::SourceRefIfDev, - ) - .clone(), - ), + PhpMixed::String(root.get_full_pretty_version( + true, + crate::package::DisplayMode::SourceRefIfDev, + )), ); let root_licenses = root.get_license(); output_map.insert( diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index 2ab1d9d5..52d0682c 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -207,9 +207,7 @@ pub trait PackageDiscoveryTrait: BaseCommand { // Collect existing packages let composer = self.try_composer(None, None); let composer_ref = composer.as_ref().map(|c| c.borrow_partial()); - let repository_manager = composer_ref - .as_ref() - .map(|c| c.get_repository_manager().clone()); + let repository_manager = composer_ref.as_ref().map(|c| c.get_repository_manager()); let repository_manager_ref = repository_manager.as_ref().map(|rm| rm.borrow()); let installed_repo = repository_manager_ref .as_ref() @@ -553,7 +551,7 @@ pub trait PackageDiscoveryTrait: BaseCommand { "Package {} has requirements incompatible with your PHP version, PHP extensions and Composer version{}", name, self.get_platform_exception_details( - candidate.clone(), + candidate, platform_repo, )?, ), @@ -606,7 +604,7 @@ pub trait PackageDiscoveryTrait: BaseCommand { message: format!( "Could not find a version of package {} matching your minimum-stability ({}). Require it with an explicit version constraint allowing its desired stability.", name, - effective_minimum_stability.clone(), + effective_minimum_stability, ), code: 0, } @@ -649,7 +647,7 @@ pub trait PackageDiscoveryTrait: BaseCommand { "Could not find package {} in any version matching your PHP version, PHP extensions and Composer version{}{}", name, self.get_platform_exception_details( - candidate.clone(), + candidate, platform_repo, )?, additional, @@ -741,11 +739,11 @@ pub trait PackageDiscoveryTrait: BaseCommand { let package = package.unwrap(); Ok(( - package.get_pretty_name().to_string(), + package.get_pretty_name(), if fixed { - package.get_pretty_version().to_string() + package.get_pretty_version() } else { - version_selector.find_recommended_require_version(package.clone())? + version_selector.find_recommended_require_version(package)? }, )) } diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs index 776fca79..eaf9ed41 100644 --- a/crates/shirabe/src/command/remove_command.rs +++ b/crates/shirabe/src/command/remove_command.rs @@ -268,10 +268,7 @@ impl Command for RemoveCommand { } } - let unused: Vec<String> = locked_packages - .iter() - .map(|p| p.get_name().to_string()) - .collect(); + let unused: Vec<String> = locked_packages.iter().map(|p| p.get_name()).collect(); packages.extend(unused); if packages.is_empty() { @@ -485,11 +482,8 @@ impl Command for RemoveCommand { if dry_run { let root_package = composer.get_package(); let mut links: IndexMap<String, IndexMap<String, _>> = IndexMap::new(); - links.insert("require".to_string(), root_package.get_requires().clone()); - links.insert( - "require-dev".to_string(), - root_package.get_dev_requires().clone(), - ); + links.insert("require".to_string(), root_package.get_requires()); + links.insert("require-dev".to_string(), root_package.get_dev_requires()); for (link_type, names) in &to_remove { for name in names { if let Some(section) = links.get_mut(link_type.as_str()) { diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs index c42b70c4..2e9e0020 100644 --- a/crates/shirabe/src/command/repository_command.rs +++ b/crates/shirabe/src/command/repository_command.rs @@ -336,7 +336,7 @@ impl Command for RepositoryCommand { .unwrap() .insert_repository( name.as_deref().unwrap(), - repo_config.clone(), + repo_config, reference_name, offset, )?; @@ -352,7 +352,7 @@ impl Command for RepositoryCommand { .borrow_mut() .as_mut() .unwrap() - .add_repository(name.as_deref().unwrap(), repo_config.clone(), append)?; + .add_repository(name.as_deref().unwrap(), repo_config, append)?; Ok(0) } "remove" | "rm" | "delete" => { diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index c1730942..57445b14 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -298,7 +298,7 @@ impl Command for RequireCommand { let preferred_stability = if composer.get_package().get_prefer_stable() { "stable".to_string() } else { - composer.get_package().get_minimum_stability().to_string() + composer.get_package().get_minimum_stability() }; // Hoist argument computations into locals so no borrow of `input` is held across the @@ -808,15 +808,13 @@ impl RequireCommand { root_package.set_dev_requires(links["require-dev"].clone()); // extract stability flags & references as they weren't present when loading the unmodified composer.json - let references = RootPackageLoader::extract_references( - requirements, - root_package.get_references().clone(), - ); + let references = + RootPackageLoader::extract_references(requirements, root_package.get_references()); root_package.set_references(references); let stability_flags = RootPackageLoader::extract_stability_flags( requirements, &root_package.get_minimum_stability(), - root_package.get_stability_flags().clone(), + root_package.get_stability_flags(), ); root_package.set_stability_flags(stability_flags); } @@ -970,7 +968,7 @@ impl RequireCommand { .set_dev_mode(update_dev_mode) .set_optimize_autoloader(optimize) .set_class_map_authoritative(authoritative) - .set_apcu_autoloader(apcu, apcu_prefix.clone()) + .set_apcu_autoloader(apcu, apcu_prefix) .set_update(true) .set_install( !input diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 4ba20575..c4519924 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -372,7 +372,7 @@ impl Command for ShowCommand { repos = RepositoryInterfaceHandle::new(InstalledRepository::new(vec![ RepositoryInterfaceHandle::new(RootPackageRepository::new(package.clone())), ])); - single_package = Some(package.clone().into()); + single_package = Some(package.into()); } else if input.borrow().get_option("platform")?.as_bool() == Some(true) { installed_repo = RepositoryInterfaceHandle::new(InstalledRepository::new(vec![ platform_repo.clone().into(), @@ -497,7 +497,7 @@ impl Command for ShowCommand { let new_repo = RepositoryInterfaceHandle::new(InstalledRepository::new(vec![lr_handle])); installed_repo = new_repo.clone(); - repos = new_repo.clone(); + repos = new_repo; } else { // --installed / default case let composer_local_owned; @@ -853,7 +853,7 @@ impl Command for ShowCommand { input.borrow_mut().set_option("path", PhpMixed::Bool(false)); } - for repo in RepositoryUtils::flatten_repositories(repos.clone(), true) { + for repo in RepositoryUtils::flatten_repositories(repos, true) { let r#type = if Self::same_repository(&repo, &platform_repo) { "platform" } else if locked_repo @@ -2028,7 +2028,7 @@ impl ShowCommand { let mut json: IndexMap<String, PhpMixed> = IndexMap::new(); json.insert( "name".to_string(), - PhpMixed::String(package.get_pretty_name().to_string()), + PhpMixed::String(package.get_pretty_name()), ); json.insert( "description".to_string(), @@ -2040,10 +2040,7 @@ impl ShowCommand { .map(PhpMixed::String) .collect(); json.insert("keywords".to_string(), PhpMixed::List(keywords)); - json.insert( - "type".to_string(), - PhpMixed::String(package.get_type().to_string()), - ); + json.insert("type".to_string(), PhpMixed::String(package.get_type())); json.insert( "homepage".to_string(), match package.get_homepage() { @@ -2068,7 +2065,7 @@ impl ShowCommand { let latest: PackageInterfaceHandle = if let Some(latest) = latest_package { json.insert( "latest".to_string(), - PhpMixed::String(latest.get_pretty_version().to_string()), + PhpMixed::String(latest.get_pretty_version()), ); latest } else { @@ -2148,7 +2145,7 @@ impl ShowCommand { json.insert( "replacement".to_string(), match c.get_replacement_package() { - Some(rp) => PhpMixed::String(rp.to_string()), + Some(rp) => PhpMixed::String(rp), None => PhpMixed::Null, }, ); @@ -2460,7 +2457,7 @@ impl ShowCommand { remote_repos: &RepositoryInterfaceHandle, ) -> IndexMap<String, PhpMixed> { let requires = { - let mut r: IndexMap<String, Link> = package.get_requires().clone(); + let mut r: IndexMap<String, Link> = package.get_requires(); r.sort_keys(); r }; @@ -2505,11 +2502,11 @@ impl ShowCommand { let mut tree: IndexMap<String, PhpMixed> = IndexMap::new(); tree.insert( "name".to_string(), - PhpMixed::String(package.get_pretty_name().to_string()), + PhpMixed::String(package.get_pretty_name()), ); tree.insert( "version".to_string(), - PhpMixed::String(package.get_pretty_version().to_string()), + PhpMixed::String(package.get_pretty_version()), ); tree.insert( "description".to_string(), @@ -2620,7 +2617,7 @@ impl ShowCommand { }; let (package, _) = self.get_package(installed_repo, remote_repos, name, version_arg)?; if let Some(package) = package { - let mut requires = package.get_requires().clone(); + let mut requires = package.get_requires(); requires.sort_keys(); for (require_name, require) in requires.iter() { let mut current_tree = packages_in_tree.to_vec(); @@ -2687,7 +2684,7 @@ impl ShowCommand { return Ok("up-to-date".to_string()); } - let mut constraint = package.get_version().to_string(); + let mut constraint = package.get_version(); if !constraint.starts_with("dev-") { constraint = format!("^{}", constraint); } @@ -2734,10 +2731,7 @@ impl ShowCommand { let composer_ref = crate::composer::composer_full(composer); let mut version_selector = VersionSelector::new(repo_set, Some(&mut *platform_repo.borrow_mut()))?; - let mut stability = composer_ref - .get_package() - .get_minimum_stability() - .to_string(); + let mut stability = composer_ref.get_package().get_minimum_stability(); let flags = composer_ref.get_package().get_stability_flags(); if let Some(flag_value) = flags.get(&name) { let key_map: IndexMap<String, String> = base_package::STABILITIES @@ -2750,9 +2744,9 @@ impl ShowCommand { } } - let mut best_stability = stability.clone(); + let mut best_stability = stability; if composer_ref.get_package().get_prefer_stable() { - best_stability = package.get_stability().to_string(); + best_stability = package.get_stability(); } let mut target_version: Option<String> = None; @@ -2855,7 +2849,7 @@ impl ShowCommand { if self.repository_set.borrow().is_none() { let mut rs = RepositorySet::new( &composer.get_package().get_minimum_stability(), - composer.get_package().get_stability_flags().clone(), + composer.get_package().get_stability_flags(), Vec::new(), IndexMap::new(), IndexMap::new(), diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs index 29f04157..1c8afca8 100644 --- a/crates/shirabe/src/command/status_command.rs +++ b/crates/shirabe/src/command/status_command.rs @@ -69,8 +69,8 @@ impl StatusCommand { }); let mut guesser = VersionGuesser::new( composer.get_config(), - process_executor.clone(), - parser.clone(), + process_executor, + parser, Some(io.clone()), ); let dumper = ArrayDumper::new(); @@ -117,8 +117,8 @@ impl StatusCommand { .is_some() { let previous_ref = match package.get_installation_source().as_deref() { - Some("source") => package.get_source_reference().map(|s| s.to_string()), - Some("dist") => package.get_dist_reference().map(|s| s.to_string()), + Some("source") => package.get_source_reference(), + Some("dist") => package.get_dist_reference(), _ => None, }; diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index d6c20b45..686e784d 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -206,12 +206,12 @@ impl Command for UpdateCommand { let root_package = composer.get_package(); root_package.set_references(RootPackageLoader::extract_references( &reqs, - root_package.get_references().clone(), + root_package.get_references(), )); root_package.set_stability_flags(RootPackageLoader::extract_stability_flags( &reqs, &root_package.get_minimum_stability(), - root_package.get_stability_flags().clone(), + root_package.get_stability_flags(), )); let parser = VersionParser::new(); @@ -478,7 +478,7 @@ impl Command for UpdateCommand { ) .set_optimize_autoloader(optimize) .set_class_map_authoritative(authoritative) - .set_apcu_autoloader(apcu, apcu_prefix.clone()) + .set_apcu_autoloader(apcu, apcu_prefix) .set_update(true) .set_install( !input @@ -766,9 +766,9 @@ impl UpdateCommand { .collect(); let mut repository_set = RepositorySet::new( &composer.get_package().get_minimum_stability(), - composer.get_package().get_stability_flags().clone(), + composer.get_package().get_stability_flags(), root_aliases, - composer.get_package().get_references().clone(), + composer.get_package().get_references(), IndexMap::new(), IndexMap::new(), ); |