diff options
Diffstat (limited to 'crates/shirabe/src/json')
| -rw-r--r-- | crates/shirabe/src/json/json_file.rs | 12 | ||||
| -rw-r--r-- | crates/shirabe/src/json/json_manipulator.rs | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/crates/shirabe/src/json/json_file.rs b/crates/shirabe/src/json/json_file.rs index ca8b11e0..2d1185e8 100644 --- a/crates/shirabe/src/json/json_file.rs +++ b/crates/shirabe/src/json/json_file.rs @@ -450,11 +450,8 @@ impl JsonFile { let indent_owned = options.indent; return Ok(Preg::replace_callback( php_regex!(r"#^ {4,}#m"), - move |m: &shirabe_pcre::PregMatchedGroups| -> String { - let whole = m - .get(&shirabe_pcre::CaptureKey::ByIndex(0)) - .map(|s| s.as_str()) - .unwrap_or(""); + move |m: &shirabe_pcre::PregMatches| -> String { + let whole = m.get(&shirabe_pcre::CaptureKey::ByIndex(0)).unwrap_or(""); str_repeat(&indent_owned, (strlen(whole) / 4) as usize) }, &json, @@ -555,7 +552,10 @@ impl JsonFile { pub fn detect_indenting(json: Option<&str>) -> String { if let Some(m) = Preg::is_match3(php_regex!(r##"#^([ \t]+)"#m"##), json.unwrap_or("")) { - return m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); + return m + .get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(); } Self::INDENT_DEFAULT.to_string() diff --git a/crates/shirabe/src/json/json_manipulator.rs b/crates/shirabe/src/json/json_manipulator.rs index c58f316d..92661d41 100644 --- a/crates/shirabe/src/json/json_manipulator.rs +++ b/crates/shirabe/src/json/json_manipulator.rs @@ -117,8 +117,8 @@ impl JsonManipulator { { let groups_1 = groups .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); // link missing but non empty links links = Preg::replace( format!("{{{}$}}", preg_quote(&groups_1, None)), @@ -1325,8 +1325,8 @@ impl JsonManipulator { { let tail_match_1 = tail_match .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); self.contents = Preg::replace( format!("#{}\\}}$#", tail_match_1), &addcslashes( |