diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-20 01:16:50 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-20 02:22:41 +0900 |
| commit | efec43b3b8827820cf35fe1b73d8e33f5fe84eb4 (patch) | |
| tree | a62bbba72324de48be5f8e689559f8d9e288fc61 /crates/shirabe/src/package/version/version_selector.rs | |
| parent | cac18ef73a39b4ac41fa4d6ccb753804d4c42cb7 (diff) | |
| download | php-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.tar.gz php-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.tar.zst php-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.zip | |
refactor: auto-fix clippy warnings
Diffstat (limited to 'crates/shirabe/src/package/version/version_selector.rs')
| -rw-r--r-- | crates/shirabe/src/package/version/version_selector.rs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs index 872ca93..0d69132 100644 --- a/crates/shirabe/src/package/version/version_selector.rs +++ b/crates/shirabe/src/package/version/version_selector.rs @@ -59,6 +59,7 @@ impl VersionSelector { }) } + #[allow(clippy::too_many_arguments, reason = "to keep PHP signature")] pub fn find_best_candidate( &mut self, package_name: &str, @@ -92,7 +93,7 @@ impl VersionSelector { }; let mut candidates = self.repository_set.borrow().find_packages( &strtolower(package_name), - constraint.as_ref().map(|c| c.clone()), + constraint.clone(), repo_set_flags, )?; @@ -158,16 +159,16 @@ impl VersionSelector { .as_any() .downcast_ref::<IgnoreListPlatformRequirementFilter>( ); - if let Some(list_filter) = list_filter_opt { - if list_filter.is_upper_bound_ignored(name) { - let filtered_constraint = list_filter.filter_constraint( - name, - link.get_constraint().clone(), - false, - )?; - if filtered_constraint.matches(provided_constraint) { - continue 'reqs; - } + if let Some(list_filter) = list_filter_opt + && list_filter.is_upper_bound_ignored(name) + { + let filtered_constraint = list_filter.filter_constraint( + name, + link.get_constraint().clone(), + false, + )?; + if filtered_constraint.matches(provided_constraint) { + continue 'reqs; } } } @@ -220,13 +221,13 @@ impl VersionSelector { continue; } - found_package = Some(pkg.clone().into()); + found_package = Some(pkg.clone()); break; } package = found_package; } else { package = if !candidates.is_empty() { - Some(candidates.remove(0).into()) + Some(candidates.remove(0)) } else { None }; @@ -279,14 +280,13 @@ impl VersionSelector { let loader = ArrayLoader::new(Some(self.get_parser().clone()), false); let dumper = ArrayDumper::new(); let extra = loader.get_branch_alias(&dumper.dump(package.clone()))?; - if let Some(extra) = extra { - if extra != VersionParser::DEFAULT_BRANCH_ALIAS { - let new_extra = - Preg::replace(r"{^(\d+\.\d+\.\d+)(\.9999999)-dev$}", "$1.0", &extra); - if new_extra != extra { - let new_extra = new_extra.replace(".9999999", ".0"); - return self.transform_version(&new_extra, &new_extra, "dev"); - } + if let Some(extra) = extra + && extra != VersionParser::DEFAULT_BRANCH_ALIAS + { + let new_extra = Preg::replace(r"{^(\d+\.\d+\.\d+)(\.9999999)-dev$}", "$1.0", &extra); + if new_extra != extra { + let new_extra = new_extra.replace(".9999999", ".0"); + return self.transform_version(&new_extra, &new_extra, "dev"); } } |
