diff options
Diffstat (limited to 'crates/shirabe-symfony-console/src/helper/progress_bar.rs')
| -rw-r--r-- | crates/shirabe-symfony-console/src/helper/progress_bar.rs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/crates/shirabe-symfony-console/src/helper/progress_bar.rs b/crates/shirabe-symfony-console/src/helper/progress_bar.rs index 7a7a3c53..1ea55021 100644 --- a/crates/shirabe-symfony-console/src/helper/progress_bar.rs +++ b/crates/shirabe-symfony-console/src/helper/progress_bar.rs @@ -9,7 +9,7 @@ use crate::output::OutputInterface; use crate::output::output_interface; use crate::terminal::Terminal; use indexmap::IndexMap; -use shirabe_php_shim::{CaptureKey, PregMatches, preg_replace_callback}; +use shirabe_php_shim::{PregMatches, preg_replace_callback}; pub const FORMAT_VERBOSE: &str = "verbose"; pub const FORMAT_VERY_VERBOSE: &str = "very_verbose"; @@ -799,10 +799,7 @@ impl ProgressBar { // $callback in PHP, expressed as a closure over $this and the matches. let callback = |matches: &PregMatches| -> anyhow::Result<String> { - let name = matches - .get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(); + let name = matches.get(1).unwrap_or_default().to_string(); let text: shirabe_php_shim::PhpMixed = if Self::get_placeholder_formatter_definition(&name).is_some() { @@ -816,13 +813,10 @@ impl ProgressBar { } else if let Some(message) = self.messages.get(&name) { shirabe_php_shim::PhpMixed::String(message.clone()) } else { - return Ok(matches - .get(&CaptureKey::ByIndex(0)) - .unwrap_or_default() - .to_string()); + return Ok(matches.get(0).unwrap_or_default().to_string()); }; - if let Some(modifier) = matches.get(&CaptureKey::ByIndex(2)) { + if let Some(modifier) = matches.get(2) { return Ok(shirabe_php_shim::sprintf(&format!("%{modifier}"), &[text])); } |