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/package/archiver/archivable_files_finder.rs | 3 +-- crates/shirabe/src/package/archiver/archive_manager.rs | 4 ++-- crates/shirabe/src/package/archiver/base_exclude_filter.rs | 7 ++----- crates/shirabe/src/package/archiver/git_exclude_filter.rs | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/package/archiver') diff --git a/crates/shirabe/src/package/archiver/archivable_files_finder.rs b/crates/shirabe/src/package/archiver/archivable_files_finder.rs index 2e9a3f2..c6a2d39 100644 --- a/crates/shirabe/src/package/archiver/archivable_files_finder.rs +++ b/crates/shirabe/src/package/archiver/archivable_files_finder.rs @@ -59,8 +59,7 @@ impl ArchivableFilesFinder { &format!("^{}", preg_quote(&sources_clone, Some('#'))), "", &fs.normalize_path(&realpath.to_string_lossy()), - ) - .unwrap_or_default(); + ); let mut exclude = false; for f in &filters { diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs index a4169ef..cb15b76 100644 --- a/crates/shirabe/src/package/archiver/archive_manager.rs +++ b/crates/shirabe/src/package/archiver/archive_manager.rs @@ -62,7 +62,7 @@ impl ArchiveManager { ) -> anyhow::Result> { let base_name = match package.get_archive_name() { Some(name) => name.to_string(), - None => Preg::replace("#[^a-z0-9-_]#i", "-", &package.get_name())?, + None => Preg::replace("#[^a-z0-9-_]#i", "-", &package.get_name()), }; let mut parts: IndexMap = IndexMap::new(); @@ -70,7 +70,7 @@ impl ArchiveManager { let dist_reference = package.get_dist_reference(); if let Some(ref dist_ref) = dist_reference { - if Preg::is_match("{^[a-f0-9]{40}$}", dist_ref).unwrap_or(false) { + if Preg::is_match("{^[a-f0-9]{40}$}", dist_ref) { parts.insert("dist_reference".to_string(), dist_ref.to_string()); if let Some(dist_type) = package.get_dist_type() { parts.insert("dist_type".to_string(), dist_type.to_string()); diff --git a/crates/shirabe/src/package/archiver/base_exclude_filter.rs b/crates/shirabe/src/package/archiver/base_exclude_filter.rs index 4de3cbb..1bd5b85 100644 --- a/crates/shirabe/src/package/archiver/base_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/base_exclude_filter.rs @@ -86,11 +86,8 @@ pub trait BaseExcludeFilter { relative_path }; - // suppressed RuntimeException, equivalent to PHP try-catch - if let Ok(matched) = Preg::is_match(pattern, path) { - if matched { - exclude = !negate; - } + if Preg::is_match(pattern, path) { + exclude = !negate; } } diff --git a/crates/shirabe/src/package/archiver/git_exclude_filter.rs b/crates/shirabe/src/package/archiver/git_exclude_filter.rs index ffa349c..aeaed0a 100644 --- a/crates/shirabe/src/package/archiver/git_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/git_exclude_filter.rs @@ -34,7 +34,7 @@ impl GitExcludeFilter { } fn parse_git_attributes_line_static(line: &str) -> Option<(String, bool, bool)> { - let parts = Preg::split(r"\s+", line).unwrap_or_default(); + let parts = Preg::split(r"\s+", line); if parts.len() == 2 && parts[1] == "export-ignore" { return Some(BaseExcludeFilterBase::generate_pattern(&parts[0])); -- cgit v1.3.1