diff options
Diffstat (limited to 'crates/shirabe/src/io')
| -rw-r--r-- | crates/shirabe/src/io/base_io.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/io/buffer_io.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/shirabe/src/io/base_io.rs b/crates/shirabe/src/io/base_io.rs index 9cd0d333..126c1201 100644 --- a/crates/shirabe/src/io/base_io.rs +++ b/crates/shirabe/src/io/base_io.rs @@ -10,7 +10,7 @@ use shirabe_external_packages::composer::pcre::Preg; use shirabe_external_packages::psr::log::LogLevel; use shirabe_php_shim::{ JSON_INVALID_UTF8_IGNORE, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, PhpMixed, - UnexpectedValueException, array_merge, in_array, json_encode_ex, + UnexpectedValueException, array_merge, in_array, json_encode_ex, php_regex, }; fn log_context(context: &[(&str, &str)]) -> IndexMap<String, PhpMixed> { @@ -141,7 +141,7 @@ pub trait BaseIO: IOInterface { config.merge(&config_outer, "implicit-due-to-auth"); } - if !Preg::is_match(r"{^[.A-Za-z0-9_]+$}", &token_str) { + if !Preg::is_match(php_regex!(r"{^[.A-Za-z0-9_]+$}"), &token_str) { return Err(anyhow::anyhow!(UnexpectedValueException { message: format!( "Your github oauth token for {} contains invalid characters: \"{}\"", diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs index 72c452be..0aaa5e07 100644 --- a/crates/shirabe/src/io/buffer_io.rs +++ b/crates/shirabe/src/io/buffer_io.rs @@ -9,8 +9,8 @@ use shirabe_external_packages::symfony::console::input::StringInput; use shirabe_external_packages::symfony::console::output::OutputInterface; use shirabe_external_packages::symfony::console::output::StreamOutput; use shirabe_php_shim::{ - PHP_EOL, PhpMixed, PhpResource, RuntimeException, SEEK_SET, fopen, fseek, fwrite, rewind, - stream_get_contents, strip_tags, + PHP_EOL, PhpMixed, PhpResource, RuntimeException, SEEK_SET, fopen, fseek, fwrite, php_regex, + rewind, stream_get_contents, strip_tags, }; #[derive(Debug)] @@ -76,7 +76,7 @@ impl BufferIO { let mut output = output; loop { let next = Preg::replace_callback( - r"{(^|\n|\x08)(.+?)(\x08+)}", + php_regex!(r"{(^|\n|\x08)(.+?)(\x08+)}"), |matches: &indexmap::IndexMap< shirabe_external_packages::composer::pcre::CaptureKey, String, |