From d609680083f078bdfec7f1acbed55ed9c79c27d2 Mon Sep 17 00:00:00 2001
From: Taus <tausbn@github.com>
Date: Thu, 2 Jul 2026 21:03:59 +0000
Subject: [PATCH] yeast: Fix escaping bug in yeast-macros

Happily, it turned out that there was already a library function for
handling this case.
---
 shared/yeast-macros/src/parse.rs | 37 +++++---------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/shared/yeast-macros/src/parse.rs b/shared/yeast-macros/src/parse.rs
index 986a9bac641..01c0b574b1c 100644
--- a/shared/yeast-macros/src/parse.rs
+++ b/shared/yeast-macros/src/parse.rs
@@ -1183,39 +1183,12 @@ fn parse_named_string_arg(tokens: &mut Tokens, expected_name: &str) -> Result<Na
     Ok(NamedString { value, span })
 }
 
-/// Read a literal as a plain Rust string, stripping the surrounding quotes
-/// and unescaping. Falls back to `None` if the literal isn't a string.
+/// Read a literal as a plain Rust string, respecting Rust's own escape
+/// rules (via `syn::LitStr`). Falls back to `None` if the literal
+/// isn't a string.
 fn string_literal_value(lit: &Literal) -> Option<String> {
-    let raw = lit.to_string();
-    let bytes = raw.as_bytes();
-    // Match plain `"..."` literals; reject byte strings, raw strings (for
-    // simplicity), char literals, numbers, etc.
-    if bytes.first() != Some(&b'"') || bytes.last() != Some(&b'"') {
-        return None;
-    }
-    let mut out = String::with_capacity(raw.len());
-    let mut chars = raw[1..raw.len() - 1].chars();
-    while let Some(c) = chars.next() {
-        if c != '\\' {
-            out.push(c);
-            continue;
-        }
-        match chars.next()? {
-            'n' => out.push('\n'),
-            't' => out.push('\t'),
-            'r' => out.push('\r'),
-            '\\' => out.push('\\'),
-            '\'' => out.push('\''),
-            '"' => out.push('"'),
-            '0' => out.push('\0'),
-            other => {
-                // Unknown escape — give up rather than silently mis-parse.
-                out.push('\\');
-                out.push(other);
-            }
-        }
-    }
-    Some(out)
+    let tokens = TokenStream::from(TokenTree::Literal(lit.clone()));
+    syn::parse2::<syn::LitStr>(tokens).ok().map(|s| s.value())
 }
 
 /// Split a token stream into top-level comma-separated items. Commas inside