diff options
Diffstat (limited to 'crates/shirabe/src/config.rs')
| -rw-r--r-- | crates/shirabe/src/config.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crates/shirabe/src/config.rs b/crates/shirabe/src/config.rs index dd86149c..92b13fb8 100644 --- a/crates/shirabe/src/config.rs +++ b/crates/shirabe/src/config.rs @@ -8,7 +8,7 @@ pub use json_config_source::*; use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_pcre::{CaptureKey, Preg, PregMatches}; +use shirabe_pcre::{Preg, PregMatches}; use shirabe_php_shim::{ E_USER_DEPRECATED, PhpMixed, RuntimeException, array_key_exists, array_merge, array_search_mixed, array_unique, empty, filter_var_url, implode, in_array_loose, @@ -658,12 +658,12 @@ impl Config { .into()); }; let mut size = matches - .get(&CaptureKey::ByIndex(1)) + .get(1) .unwrap_or_default() .to_string() .parse::<f64>() .unwrap_or(0.0); - let unit = matches.get(&CaptureKey::ByIndex(2)).map(str::to_string); + let unit = matches.get(2).map(str::to_string); if let Some(unit) = unit { match strtolower(&unit).as_str() { "g" => { @@ -960,10 +960,7 @@ impl Config { let result = Preg::replace_callback( php_regex!(r"#\{\$(.+)\}#"), |m: &PregMatches| -> String { - let key_match = m - .get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(); + let key_match = m.get(1).unwrap_or_default().to_string(); match self.get_with_flags(&key_match, flags) { Ok(v) => php_to_string(&v), Err(e) => { |
