diff options
Diffstat (limited to 'crates/shirabe/src/package')
| -rw-r--r-- | crates/shirabe/src/package/loader/root_package_loader.rs | 19 | ||||
| -rw-r--r-- | crates/shirabe/src/package/locker.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/src/package/package.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/package/version/version_guesser.rs | 18 |
4 files changed, 32 insertions, 11 deletions
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index b7216c62..1d068ad6 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -256,8 +256,14 @@ impl RootPackageLoader { php_regex!(r"{(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *,)}"), req_version, ) { - let m1 = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); - let m2 = m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(); + let m1 = m + .get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(); + let m2 = m + .get(&CaptureKey::ByIndex(2)) + .unwrap_or_default() + .to_string(); let mut alias = IndexMap::new(); alias.insert("package".to_string(), strtolower(req_name)); alias.insert( @@ -318,7 +324,10 @@ impl RootPackageLoader { for constraint in &constraints { if let Some(m) = Preg::is_match3(&pattern, constraint) { let name = strtolower(req_name); - let m1 = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); + let m1 = m + .get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(); let normalized_m1 = VersionParser::normalize_stability(&m1).unwrap_or_default(); let stability = stabilities[normalized_m1.as_str()]; @@ -368,7 +377,9 @@ impl RootPackageLoader { let name = strtolower(req_name); references.insert( name, - m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(), + m.get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(), ); } } diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index 6e7145ae..f27f44a2 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -849,8 +849,8 @@ impl Locker { ) { let ts = m .get(&CaptureKey::ByIndex(1)) - .cloned() .unwrap_or_default() + .to_string() .parse::<i64>() .unwrap_or(0); datetime = chrono::DateTime::from_timestamp(ts, 0); diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index 2054d396..c987f2fe 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -433,11 +433,11 @@ impl Package { // dist URL never carries more than one SHA reference. self.set_dist_url(Some(Preg::replace_callback( php_regex!("{(/|sha=)[a-f0-9]{40}(/|$)}i"), - |m: &shirabe_pcre::PregMatchedGroups| -> String { + |m: &shirabe_pcre::PregMatches| -> String { let get = |i: usize| -> String { m.get(&shirabe_pcre::CaptureKey::ByIndex(i)) - .cloned() .unwrap_or_default() + .to_string() }; format!("{}{}{}", get(1), reference, get(2)) }, diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index 14fcf5f6..daa25361 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -236,8 +236,14 @@ impl VersionGuesser { &branch, ) { - let g1 = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); - let g2 = m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(); + let g1 = m + .get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(); + let g2 = m + .get(&CaptureKey::ByIndex(2)) + .unwrap_or_default() + .to_string(); if g1 == "(no branch)" || strpos(&g1, "(detached ") == Some(0) || strpos(&g1, "(HEAD detached at") == Some(0) @@ -264,7 +270,11 @@ impl VersionGuesser { &branch, ) { - branches.push(m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default()); + branches.push( + m.get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(), + ); } } @@ -753,7 +763,7 @@ impl VersionGuesser { if let Some(m) = Preg::is_match3(php_regex!(r"{^(\d+(?:\.\d+)*)-dev$}i"), &version) { return Ok(format!( "{}.x-dev", - m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default() + m.get(&CaptureKey::ByIndex(1)).unwrap_or_default() )); } |