aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/installer
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-14 11:24:36 +0900
committernsfisis <nsfisis@gmail.com>2026-06-14 11:28:19 +0900
commit716f44031a39c5e43fb441ecc470db76efc23dd4 (patch)
treee6f4a31e4bf55a0a8efb06d9dd4844c567e7390f /crates/shirabe/src/installer
parentef9118c788c1cbb22ca7721b6a9e40c2bf2fe243 (diff)
downloadphp-shirabe-716f44031a39c5e43fb441ecc470db76efc23dd4.tar.gz
php-shirabe-716f44031a39c5e43fb441ecc470db76efc23dd4.tar.zst
php-shirabe-716f44031a39c5e43fb441ecc470db76efc23dd4.zip
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 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/installer')
-rw-r--r--crates/shirabe/src/installer/binary_installer.rs6
-rw-r--r--crates/shirabe/src/installer/library_installer.rs2
-rw-r--r--crates/shirabe/src/installer/suggested_packages_reporter.rs1
3 files changed, 2 insertions, 7 deletions
diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs
index 778a8a0..bc7d694 100644
--- a/crates/shirabe/src/installer/binary_installer.rs
+++ b/crates/shirabe/src/installer/binary_installer.rs
@@ -177,9 +177,7 @@ impl BinaryInstaller {
r"{^#!/(?:usr/bin/env )?(?:[^/]+/)*(.+)$}m",
&line,
Some(&mut m),
- )
- .unwrap_or(false)
- {
+ ) {
return trim(
m.get(&CaptureKey::ByIndex(1))
.map(|s| s.as_str())
@@ -299,8 +297,6 @@ impl BinaryInstaller {
// which allows calling the proxy with a custom php process
if let Some(m) =
Preg::is_match_with_indexed_captures(r"{^(#!.*\r?\n)?[\r\n\t ]*<\?php}", &bin_contents)
- .ok()
- .flatten()
{
// carry over the existing shebang if present, otherwise add our own
let proxy_code = if m.get(1).is_none() {
diff --git a/crates/shirabe/src/installer/library_installer.rs b/crates/shirabe/src/installer/library_installer.rs
index da5533c..9fb3e43 100644
--- a/crates/shirabe/src/installer/library_installer.rs
+++ b/crates/shirabe/src/installer/library_installer.rs
@@ -119,7 +119,7 @@ impl LibraryInstaller {
"",
&install_path,
);
- return replaced.unwrap_or(install_path);
+ return replaced;
}
}
diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs
index 875fdc6..2a2ed9f 100644
--- a/crates/shirabe/src/installer/suggested_packages_reporter.rs
+++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs
@@ -206,6 +206,5 @@ impl SuggestedPackagesReporter {
fn remove_control_characters(&self, string: &str) -> String {
Preg::replace("/[[:cntrl:]]/", "", &string.replace('\n', " "))
- .unwrap_or_else(|_| string.replace('\n', " "))
}
}