aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/config.rs
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/config.rs
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/config.rs')
-rw-r--r--crates/shirabe/src/config.rs13
1 files changed, 4 insertions, 9 deletions
diff --git a/crates/shirabe/src/config.rs b/crates/shirabe/src/config.rs
index 5333173..7e63dff 100644
--- a/crates/shirabe/src/config.rs
+++ b/crates/shirabe/src/config.rs
@@ -506,7 +506,6 @@ impl Config {
r"{^https?://(?:[a-z0-9-.]+\.)?packagist.org(/|$)}",
&repo_url,
)
- .unwrap_or(false)
{
self.disable_repo_by_name("packagist.org");
}
@@ -688,9 +687,7 @@ impl Config {
r"/^\s*([0-9.]+)\s*(?:([kmg])(?:i?b)?)?\s*$/i",
&raw,
Some(&mut matches),
- )
- .unwrap_or(false)
- {
+ ) {
return Err(RuntimeException {
message: format!("Could not parse the value of '{}': {}", key, raw),
code: 0,
@@ -1093,7 +1090,7 @@ impl Config {
}
},
&value_str,
- )?;
+ );
if let Some(e) = error {
return Err(e);
}
@@ -1104,7 +1101,7 @@ impl Config {
///
/// Since the dirs might not exist yet we can not call realpath or it will fail.
fn realpath(&self, path: &str) -> String {
- if Preg::is_match(r"{^(?:/|[a-z]:|[a-z0-9.]+://|\\\\\\\\)}i", path).unwrap_or(false) {
+ if Preg::is_match(r"{^(?:/|[a-z]:|[a-z0-9.]+://|\\\\\\\\)}i", path) {
return path.to_string();
}
@@ -1150,9 +1147,7 @@ impl Config {
repo_options: &IndexMap<String, PhpMixed>,
) -> Result<()> {
// Return right away if the URL is malformed or custom (see issue #5173), but only for non-HTTP(S) URLs
- if !filter_var(url, FILTER_VALIDATE_URL)
- && !Preg::is_match(r"{^https?://}", url).unwrap_or(false)
- {
+ if !filter_var(url, FILTER_VALIDATE_URL) && !Preg::is_match(r"{^https?://}", url) {
return Ok(());
}