diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/lock_transaction.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/problem.rs | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/crates/shirabe/src/dependency_resolver/lock_transaction.rs b/crates/shirabe/src/dependency_resolver/lock_transaction.rs index 80a755b5..810c19af 100644 --- a/crates/shirabe/src/dependency_resolver/lock_transaction.rs +++ b/crates/shirabe/src/dependency_resolver/lock_transaction.rs @@ -176,11 +176,11 @@ impl LockTransaction { let dist_reference = present_package.get_dist_reference().unwrap(); let new_dist_url = Preg::replace_callback( php_regex!(r"{(/|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), dist_reference, get(2)) }, diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index 80f0e5db..63561e98 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -234,11 +234,17 @@ impl Problem { None }; if let Some(m) = matched { + let pkg_key = m + .get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(); + let m2 = m + .get(&CaptureKey::ByIndex(2)) + .unwrap_or_default() + .to_string(); message = str_replace("%", "%%", &message); let template = Preg::replace(php_regex!(r"{^\S+ \S+ }"), "%s%s ", &message); messages.push(template.clone()); - let pkg_key = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); - let m2 = m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(); let version_key = parser.normalize(&m2, Some("")).unwrap_or_default(); templates .entry(template.clone()) |