From e093b2be1c333e67c96aebb0a5291bea9ae3d6db Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 01:57:02 +0900 Subject: refactor(preg): drop the offset argument from preg_match Every call site but one passed offset 0. The remaining one, the UTF-8 chunking loop in Application, slices the subject instead: its pattern has no anchor or lookaround, so matching a suffix is equivalent to starting the search at that offset. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/util/github.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/util/github.rs') diff --git a/crates/shirabe/src/util/github.rs b/crates/shirabe/src/util/github.rs index 9d73ae84..a50f928a 100644 --- a/crates/shirabe/src/util/github.rs +++ b/crates/shirabe/src/util/github.rs @@ -10,7 +10,7 @@ use crate::util::ProcessExecutor; use indexmap::IndexMap; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ - PhpMixed, date_local, in_array_loose, php_regex, preg_match2, stripos, strtolower, + PhpMixed, date_local, in_array_loose, php_regex, preg_match, stripos, strtolower, }; #[derive(Debug)] @@ -326,7 +326,7 @@ impl GitHub { if stripos(header, "x-github-sso: required").is_none() { continue; } - if let Some(caps) = preg_match2(php_regex!(r"{\burl=(?P[^\s;]+)}"), header, 0) { + if let Some(caps) = preg_match(php_regex!(r"{\burl=(?P[^\s;]+)}"), header) { return caps.name("url").map(str::to_string); } } @@ -336,13 +336,7 @@ impl GitHub { pub fn is_rate_limited(&self, headers: &[String]) -> bool { for header in headers { - if preg_match2( - php_regex!(r"{^x-ratelimit-remaining: *0$}i"), - header.trim(), - 0, - ) - .is_some() - { + if preg_match(php_regex!(r"{^x-ratelimit-remaining: *0$}i"), header.trim()).is_some() { return true; } } @@ -352,7 +346,7 @@ impl GitHub { pub fn requires_sso(&self, headers: &[String]) -> bool { for header in headers { - if preg_match2(php_regex!(r"{^x-github-sso: required}i"), header.trim(), 0).is_some() { + if preg_match(php_regex!(r"{^x-github-sso: required}i"), header.trim()).is_some() { return true; } } -- cgit v1.3.1-4-g156e