From 716f44031a39c5e43fb441ecc470db76efc23dd4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 14 Jun 2026 11:24:36 +0900 Subject: refactor(pcre): drop Result from Preg method return types The Preg methods panic on PCRE failure (per the file header rationale), so their anyhow::Result wrappers never carried an Err. Co-Authored-By: Claude Opus 4.8 --- crates/shirabe/src/command/update_command.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/command/update_command.rs') diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index 6f604d5..26b05f5 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -136,7 +136,7 @@ impl UpdateCommand { if packages.len() > 0 { let allowlist_packages_with_requirements: Vec = array_filter(&packages, |pkg: &String| -> bool { - Preg::is_match(r"{\S+[ =:]\S+}", pkg).unwrap_or(false) + Preg::is_match(r"{\S+[ =:]\S+}", pkg) }); for (package, constraint) in self.format_requirements(allowlist_packages_with_requirements.clone())? @@ -146,7 +146,7 @@ impl UpdateCommand { // replace the foo/bar:req by foo/bar in the allowlist for package in &allowlist_packages_with_requirements { - let package_name = Preg::replace(r"{^([^ =:]+)[ =:].*$}", "$1", package)?; + let package_name = Preg::replace(r"{^([^ =:]+)[ =:].*$}", "$1", package); if let Some(idx) = array_search_in_vec(package, &packages) { packages[idx] = package_name; } @@ -220,7 +220,7 @@ impl UpdateCommand { let matches = Preg::is_match_with_indexed_captures( r"{^(\d+\.\d+\.\d+)}", &package.get_version(), - )?; + ); let Some(matches) = matches else { continue; }; @@ -575,7 +575,7 @@ impl UpdateCommand { let mut version_selector = self.create_version_selector(composer)?; for package in &installed_packages { if let Some(filter) = &filter { - if !Preg::is_match(filter, &package.get_name()).unwrap_or(false) { + if !Preg::is_match(filter, &package.get_name()) { continue; } } -- cgit v1.3.1