diff options
Diffstat (limited to 'crates/shirabe-external-packages')
| -rw-r--r-- | crates/shirabe-external-packages/src/composer/pcre/preg.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe-external-packages/src/symfony/console/input/string_input.rs | 13 |
2 files changed, 7 insertions, 12 deletions
diff --git a/crates/shirabe-external-packages/src/composer/pcre/preg.rs b/crates/shirabe-external-packages/src/composer/pcre/preg.rs index d35a3aa..4034649 100644 --- a/crates/shirabe-external-packages/src/composer/pcre/preg.rs +++ b/crates/shirabe-external-packages/src/composer/pcre/preg.rs @@ -50,7 +50,7 @@ impl Preg { *out = drop_null_matches(internal); } - result == 1 + result } pub fn match_all(pattern: &str, subject: &str) -> usize { @@ -234,7 +234,7 @@ impl Preg { } } - result == 1 + result } pub fn is_match_with_indexed_captures(pattern: &str, subject: &str) -> Option<Vec<String>> { @@ -243,7 +243,7 @@ impl Preg { let mut internal: IndexMap<CaptureKey, Option<String>> = IndexMap::new(); let result = shirabe_php_shim::preg_match2(pattern, subject, Some(&mut internal), 0, 0); - if result == 0 { + if !result { return None; } diff --git a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs index f57fcf6..03aaa64 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs @@ -55,9 +55,7 @@ impl StringInput { } let mut m: IndexMap<CaptureKey, Option<String>> = IndexMap::new(); - if shirabe_php_shim::preg_match2(r"/\s+/A", input, Some(&mut m), 0, cursor as usize) - == 1 - { + if shirabe_php_shim::preg_match2(r"/\s+/A", input, Some(&mut m), 0, cursor as usize) { if token.is_some() { tokens.push(token.take().unwrap()); } @@ -69,8 +67,7 @@ impl StringInput { Some(&mut m), 0, cursor as usize, - ) == 1 - { + ) { let inner = shirabe_php_shim::substr( m[&CaptureKey::ByIndex(3)].as_deref().unwrap_or(""), 1, @@ -93,8 +90,7 @@ impl StringInput { Some(&mut m), 0, cursor as usize, - ) == 1 - { + ) { token = Some(format!( "{}{}", token.unwrap_or_default(), @@ -112,8 +108,7 @@ impl StringInput { Some(&mut m), 0, cursor as usize, - ) == 1 - { + ) { token = Some(format!( "{}{}", token.unwrap_or_default(), |