Use serde-saphyr for YAML string quoting

Cargo.toml

@@ -84,7 +84,7 @@ serde_json = { version = "1.0.132", features = [
   "unbounded_depth",
 ] }
 serde_stacker = { version = "0.1.12" }
-serde-saphyr = { version = "0.0.27", default-features = false, features = [
+serde-saphyr = { version = "0.0.28", default-features = false, features = [
   "deserialize",
   "serialize",
 ] }

crates/prek/src/yaml.rs

@@ -4,42 +4,20 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::fmt::Write;
+use serde_saphyr::{DoubleQuoted, SingleQuoted};
 
 /// Serialize a YAML scalar while preserving the caller's quote style.
 pub(crate) fn serialize_yaml_scalar(value: &str, quote: &str) -> anyhow::Result<String> {
-    match quote {
-        "'" => Ok(format!("'{}'", escape_single_quoted(value))),
-        "\"" => Ok(format!("\"{}\"", escape_double_quoted(value))),
-        _ => {
-            let rendered = serde_saphyr::to_string(&value)?;
-            Ok(rendered.trim_end_matches('\n').to_owned())
-        }
-    }
-}
-
-/// YAML single-quoted strings escape a single quote by doubling it.
-fn escape_single_quoted(value: &str) -> String {
-    value.replace('\'', "''")
-}
+    let mut rendered = match quote {
+        "'" => serde_saphyr::to_string(&SingleQuoted(value))?,
+        "\"" => serde_saphyr::to_string(&DoubleQuoted(value))?,
+        _ => serde_saphyr::to_string(&value)?,
+    };
 
-/// YAML double-quoted strings use backslash escapes for control characters.
-fn escape_double_quoted(value: &str) -> String {
-    let mut escaped = String::with_capacity(value.len());
-    for ch in value.chars() {
-        match ch {
-            '\\' => escaped.push_str("\\\\"),
-            '"' => escaped.push_str("\\\""),
-            '\t' => escaped.push_str("\\t"),
-            '\n' => escaped.push_str("\\n"),
-            '\r' => escaped.push_str("\\r"),
-            c if c.is_control() => {
-                let _ = write!(escaped, "\\u{:04X}", c as u32);
-            }
-            c => escaped.push(c),
-        }
+    if rendered.ends_with('\n') {
+        rendered.pop();
     }
-    escaped
+    Ok(rendered)
 }
 
 #[cfg(test)]