diff options
Diffstat (limited to 'crates/shirabe/src/console')
| -rw-r--r-- | crates/shirabe/src/console/application.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/console/html_output_formatter.rs | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index ca645635..25379a27 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -1792,9 +1792,7 @@ impl Application { let mut offset = 0i64; while let Some(m) = preg_match2(php_regex!(r"/.{1,10000}/u"), &utf8_string, offset as usize) { - let m0 = m - .get(&shirabe_php_shim::CaptureKey::ByIndex(0)) - .unwrap_or(""); + let m0 = m.get(0).unwrap_or(""); offset += shirabe_php_shim::strlen(m0); let chunk = m0; diff --git a/crates/shirabe/src/console/html_output_formatter.rs b/crates/shirabe/src/console/html_output_formatter.rs index 4a5583fb..694f8de6 100644 --- a/crates/shirabe/src/console/html_output_formatter.rs +++ b/crates/shirabe/src/console/html_output_formatter.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Console/HtmlOutputFormatter.php use indexmap::IndexMap; -use shirabe_pcre::{CaptureKey, Preg, PregMatches}; +use shirabe_pcre::{Preg, PregMatches}; use shirabe_symfony_console::formatter::OutputFormatter; use shirabe_symfony_console::formatter::OutputFormatterInterface; use shirabe_symfony_console::formatter::OutputFormatterStyleInterface; @@ -73,8 +73,8 @@ impl HtmlOutputFormatter { } fn format_html(&self, matches: &PregMatches) -> String { - let codes_str = matches.get(&CaptureKey::ByIndex(1)).unwrap_or(""); - let content = matches.get(&CaptureKey::ByIndex(2)).unwrap_or(""); + let codes_str = matches.get(1).unwrap_or(""); + let content = matches.get(2).unwrap_or(""); let mut out = String::from("<span style=\""); for code_str in codes_str.split(';') { |